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/lib | |
| parent | 63b87bf4e6e9a2f1112c17c57796b69b3b8a2b3e (diff) | |
gr: the CMakeLists.txt took a chill pill
Diffstat (limited to 'gr-noaa/lib')
| -rw-r--r-- | gr-noaa/lib/CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
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 |