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-noaa | |
| parent | 63b87bf4e6e9a2f1112c17c57796b69b3b8a2b3e (diff) | |
gr: the CMakeLists.txt took a chill pill
Diffstat (limited to 'gr-noaa')
| -rw-r--r-- | gr-noaa/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | gr-noaa/apps/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-noaa/grc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-noaa/lib/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | gr-noaa/swig/CMakeLists.txt | 10 |
5 files changed, 29 insertions, 29 deletions
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt index b854a5e189..eecb3d6027 100644 --- a/gr-noaa/CMakeLists.txt +++ b/gr-noaa/CMakeLists.txt @@ -20,12 +20,12 @@ ######################################################################## # Setup dependencies ######################################################################## -INCLUDE(GrBoost) +include(GrBoost) ######################################################################## # Register component ######################################################################## -INCLUDE(GrComponent) +include(GrComponent) GR_REGISTER_COMPONENT("gr-noaa" ENABLE_GR_NOAA Boost_FOUND ENABLE_GR_CORE_ @@ -38,12 +38,12 @@ GR_SET_GLOBAL(GR_NOAA_INCLUDE_DIRS ######################################################################## # Begin conditional configuration ######################################################################## -IF(ENABLE_GR_NOAA) +if(ENABLE_GR_NOAA) ######################################################################## # Setup CPack components ######################################################################## -INCLUDE(GrPackage) +include(GrPackage) CPACK_SET(CPACK_COMPONENT_GROUP_NOAA_DESCRIPTION "GNU Radio NOAA Blocks") CPACK_COMPONENT("noaa_runtime" @@ -77,11 +77,11 @@ CPACK_COMPONENT("noaa_swig" ######################################################################## # Add subdirectories ######################################################################## -ADD_SUBDIRECTORY(lib) -IF(ENABLE_PYTHON) - ADD_SUBDIRECTORY(swig) - ADD_SUBDIRECTORY(grc) - ADD_SUBDIRECTORY(apps) -ENDIF(ENABLE_PYTHON) +add_subdirectory(lib) +if(ENABLE_PYTHON) + add_subdirectory(swig) + add_subdirectory(grc) + add_subdirectory(apps) +endif(ENABLE_PYTHON) -ENDIF(ENABLE_GR_NOAA) +endif(ENABLE_GR_NOAA) diff --git a/gr-noaa/apps/CMakeLists.txt b/gr-noaa/apps/CMakeLists.txt index 8ec45eb7d7..e692648b58 100644 --- a/gr-noaa/apps/CMakeLists.txt +++ b/gr-noaa/apps/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 diff --git a/gr-noaa/grc/CMakeLists.txt b/gr-noaa/grc/CMakeLists.txt index 99f8bc8374..92d707477b 100644 --- a/gr-noaa/grc/CMakeLists.txt +++ b/gr-noaa/grc/CMakeLists.txt @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -INSTALL(FILES +install(FILES noaa_hrpt_decoder.xml noaa_hrpt_deframer.xml noaa_hrpt_pll_cf.xml diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt index 2388a450e3..a3509df844 100644 --- a/gr-noaa/lib/CMakeLists.txt +++ b/gr-noaa/lib/CMakeLists.txt @@ -20,34 +20,34 @@ ######################################################################## # Setup the include and linker paths ######################################################################## -INCLUDE_DIRECTORIES( +include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_NOAA_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_noaa_sources +list(APPEND gr_noaa_sources noaa_hrpt_decoder.cc noaa_hrpt_deframer.cc noaa_hrpt_pll_cf.cc ) -LIST(APPEND noaa_libs +list(APPEND noaa_libs gnuradio-core ${Boost_LIBRARIES} ) -ADD_LIBRARY(gnuradio-noaa SHARED ${gr_noaa_sources}) -TARGET_LINK_LIBRARIES(gnuradio-noaa ${noaa_libs}) -SET_TARGET_PROPERTIES(gnuradio-noaa PROPERTIES DEFINE_SYMBOL "gnuradio_noaa_EXPORTS") -SET_TARGET_PROPERTIES(gnuradio-noaa PROPERTIES SOVERSION ${LIBVER}) +add_library(gnuradio-noaa SHARED ${gr_noaa_sources}) +target_link_libraries(gnuradio-noaa ${noaa_libs}) +set_target_properties(gnuradio-noaa PROPERTIES DEFINE_SYMBOL "gnuradio_noaa_EXPORTS") +set_target_properties(gnuradio-noaa PROPERTIES SOVERSION ${LIBVER}) -INSTALL(TARGETS gnuradio-noaa +install(TARGETS gnuradio-noaa LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "noaa_runtime" # .so/.dylib file ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "noaa_devel" # .lib file RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "noaa_runtime" # .dll file @@ -56,7 +56,7 @@ INSTALL(TARGETS gnuradio-noaa ######################################################################## # Install header files ######################################################################## -INSTALL(FILES +install(FILES noaa_api.h noaa_hrpt_decoder.h noaa_hrpt_deframer.h diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt index 8b8afcb6f4..1d754aabb4 100644 --- a/gr-noaa/swig/CMakeLists.txt +++ b/gr-noaa/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_NOAA_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ) -SET(GR_SWIG_LIBRARIES gnuradio-noaa) +set(GR_SWIG_LIBRARIES gnuradio-noaa) GR_SWIG_MAKE(noaa_swig noaa_swig.i) @@ -38,7 +38,7 @@ GR_SWIG_INSTALL( COMPONENT "noaa_python" ) -INSTALL( +install( FILES noaa_swig.i noaa_hrpt_decoder.i |