diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-08 17:11:12 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-08 17:11:12 -0700 |
| commit | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (patch) | |
| tree | 046d89555243ede65bfc7bc0a6cbfc7f870ff4cb /gr-digital | |
| parent | 63b87bf4e6e9a2f1112c17c57796b69b3b8a2b3e (diff) | |
gr: the CMakeLists.txt took a chill pill
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | gr-digital/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/grc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/include/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | gr-digital/python/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | gr-digital/swig/CMakeLists.txt | 10 |
7 files changed, 43 insertions, 43 deletions
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index 23bb48f941..babf64eeee 100644 --- a/gr-digital/CMakeLists.txt +++ b/gr-digital/CMakeLists.txt @@ -20,12 +20,12 @@ ######################################################################## # Setup dependencies ######################################################################## -INCLUDE(GrBoost) +include(GrBoost) ######################################################################## # Register component ######################################################################## -INCLUDE(GrComponent) +include(GrComponent) GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL Boost_FOUND ENABLE_GR_CORE_ @@ -42,12 +42,12 @@ GR_SET_GLOBAL(GR_DIGITAL_SWIG_INCLUDE_DIRS ######################################################################## # Begin conditional configuration ######################################################################## -IF(ENABLE_GR_DIGITAL) +if(ENABLE_GR_DIGITAL) ######################################################################## # Setup CPack components ######################################################################## -INCLUDE(GrPackage) +include(GrPackage) CPACK_SET(CPACK_COMPONENT_GROUP_DIGITAL_DESCRIPTION "GNU Radio Digital Blocks") CPACK_COMPONENT("digital_runtime" @@ -81,27 +81,27 @@ CPACK_COMPONENT("digital_swig" ######################################################################## # Add subdirectories ######################################################################## -ADD_SUBDIRECTORY(include) -ADD_SUBDIRECTORY(lib) -IF(ENABLE_PYTHON) - ADD_SUBDIRECTORY(swig) - ADD_SUBDIRECTORY(python) - ADD_SUBDIRECTORY(grc) - ADD_SUBDIRECTORY(examples) -ENDIF(ENABLE_PYTHON) +add_subdirectory(include) +add_subdirectory(lib) +if(ENABLE_PYTHON) + add_subdirectory(swig) + add_subdirectory(python) + add_subdirectory(grc) + add_subdirectory(examples) +endif(ENABLE_PYTHON) ######################################################################## # Create Pkg Config File ######################################################################## -CONFIGURE_FILE( +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-digital.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc @ONLY) -INSTALL( +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig COMPONENT "digital_devel" ) -ENDIF(ENABLE_GR_DIGITAL) +endif(ENABLE_GR_DIGITAL) diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt index 964596ae83..9632c16386 100644 --- a/gr-digital/examples/CMakeLists.txt +++ b/gr-digital/examples/CMakeLists.txt @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -INCLUDE(GrPython) +include(GrPython) GR_PYTHON_INSTALL(PROGRAMS transmit_path.py diff --git a/gr-digital/grc/CMakeLists.txt b/gr-digital/grc/CMakeLists.txt index 89c6db6e27..daca55253b 100644 --- a/gr-digital/grc/CMakeLists.txt +++ b/gr-digital/grc/CMakeLists.txt @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -INSTALL(FILES +install(FILES digital_block_tree.xml digital_binary_slicer_fb.xml digital_clock_recovery_mm_xx.xml diff --git a/gr-digital/include/CMakeLists.txt b/gr-digital/include/CMakeLists.txt index 7b38e645bd..f5d4d76b6a 100644 --- a/gr-digital/include/CMakeLists.txt +++ b/gr-digital/include/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # Install header files ######################################################################## -INSTALL(FILES +install(FILES digital_api.h digital_binary_slicer_fb.h digital_clock_recovery_mm_cc.h diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 7cd89a56f9..c100453c27 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -20,18 +20,18 @@ ######################################################################## # Setup the include and linker paths ######################################################################## -INCLUDE_DIRECTORIES( +include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_DIGITAL_INCLUDE_DIRS} ) -INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) -LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +include_directories(${Boost_INCLUDE_DIRS}) +link_directories(${Boost_LIBRARY_DIRS}) ######################################################################## # Setup library ######################################################################## -LIST(APPEND gr_digital_sources +list(APPEND gr_digital_sources digital_binary_slicer_fb.cc digital_clock_recovery_mm_cc.cc digital_clock_recovery_mm_ff.cc @@ -50,17 +50,17 @@ LIST(APPEND gr_digital_sources digital_cpmmod_bc.cc ) -LIST(APPEND digital_libs +list(APPEND digital_libs gnuradio-core ${Boost_LIBRARIES} ) -ADD_LIBRARY(gnuradio-digital SHARED ${gr_digital_sources}) -TARGET_LINK_LIBRARIES(gnuradio-digital ${digital_libs}) -SET_TARGET_PROPERTIES(gnuradio-digital PROPERTIES DEFINE_SYMBOL "gnuradio_digital_EXPORTS") -SET_TARGET_PROPERTIES(gnuradio-digital PROPERTIES SOVERSION ${LIBVER}) +add_library(gnuradio-digital SHARED ${gr_digital_sources}) +target_link_libraries(gnuradio-digital ${digital_libs}) +set_target_properties(gnuradio-digital PROPERTIES DEFINE_SYMBOL "gnuradio_digital_EXPORTS") +set_target_properties(gnuradio-digital PROPERTIES SOVERSION ${LIBVER}) -INSTALL(TARGETS gnuradio-digital +install(TARGETS gnuradio-digital LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "digital_runtime" # .so/.dylib file ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "digital_devel" # .lib file RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "digital_runtime" # .dll file diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt index db4feb9afb..7f810f14d5 100644 --- a/gr-digital/python/CMakeLists.txt +++ b/gr-digital/python/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # Setup python install ######################################################################## -INCLUDE(GrPython) +include(GrPython) GR_PYTHON_INSTALL( FILES @@ -54,18 +54,18 @@ GR_PYTHON_INSTALL( ######################################################################## # Handle the unit tests ######################################################################## -IF(ENABLE_TESTING) -INCLUDE(GrTest) -FILE(GLOB py_qa_test_files "qa_*.py") -FOREACH(py_qa_test_file ${py_qa_test_files}) - GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE) - SET(GR_TEST_PYTHON_DIRS +if(ENABLE_TESTING) +include(GrTest) +file(GLOB py_qa_test_files "qa_*.py") +foreach(py_qa_test_file ${py_qa_test_files}) + get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) + set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/gnuradio-core/src/python ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig ${CMAKE_BINARY_DIR}/gr-digital/python ${CMAKE_BINARY_DIR}/gr-digital/swig ) - SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital) + set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file}) -ENDFOREACH(py_qa_test_file) -ENDIF(ENABLE_TESTING) +endforeach(py_qa_test_file) +endif(ENABLE_TESTING) diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt index b1e6fd4e09..3df218d6e0 100644 --- a/gr-digital/swig/CMakeLists.txt +++ b/gr-digital/swig/CMakeLists.txt @@ -20,15 +20,15 @@ ######################################################################## # Setup swig generation ######################################################################## -INCLUDE(GrPython) -INCLUDE(GrSwig) +include(GrPython) +include(GrSwig) -SET(GR_SWIG_INCLUDE_DIRS +set(GR_SWIG_INCLUDE_DIRS ${GR_DIGITAL_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ) -SET(GR_SWIG_LIBRARIES gnuradio-digital) +set(GR_SWIG_LIBRARIES gnuradio-digital) GR_SWIG_MAKE(digital_swig digital_swig.i) @@ -38,7 +38,7 @@ GR_SWIG_INSTALL( COMPONENT "digital_python" ) -INSTALL( +install( FILES digital_binary_slicer_fb.i digital_clock_recovery_mm_cc.i |