diff options
| author | Josh Blum | 2011-10-08 17:11:12 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-08 17:11:12 -0700 |
| commit | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (patch) | |
| tree | 046d89555243ede65bfc7bc0a6cbfc7f870ff4cb /gr-uhd/lib/CMakeLists.txt | |
| parent | 63b87bf4e6e9a2f1112c17c57796b69b3b8a2b3e (diff) | |
| download | gnuradio-71c0f14a46f85027b95f2f5f6d3d219cc9e3783e.tar.gz gnuradio-71c0f14a46f85027b95f2f5f6d3d219cc9e3783e.tar.bz2 gnuradio-71c0f14a46f85027b95f2f5f6d3d219cc9e3783e.zip | |
gr: the CMakeLists.txt took a chill pill
Diffstat (limited to 'gr-uhd/lib/CMakeLists.txt')
| -rw-r--r-- | gr-uhd/lib/CMakeLists.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index 8afb48942..fbdca0566 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -20,38 +20,38 @@ ######################################################################## # Setup the include and linker paths ######################################################################## -INCLUDE_DIRECTORIES( +include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_UHD_INCLUDE_DIRS} ) -INCLUDE_DIRECTORIES(${UHD_INCLUDE_DIRS}) -LINK_DIRECTORIES(${UHD_LIBRARY_DIRS}) +include_directories(${UHD_INCLUDE_DIRS}) +link_directories(${UHD_LIBRARY_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_uhd_sources +list(APPEND gr_uhd_sources gr_uhd_usrp_source.cc gr_uhd_usrp_sink.cc gr_uhd_amsg_source.cc ) -LIST(APPEND uhd_libs +list(APPEND uhd_libs gnuradio-core ${Boost_LIBRARIES} ${UHD_LIBRARIES} ) -ADD_LIBRARY(gnuradio-uhd SHARED ${gr_uhd_sources}) -TARGET_LINK_LIBRARIES(gnuradio-uhd ${uhd_libs}) -SET_TARGET_PROPERTIES(gnuradio-uhd PROPERTIES DEFINE_SYMBOL "gnuradio_uhd_EXPORTS") -SET_TARGET_PROPERTIES(gnuradio-uhd PROPERTIES SOVERSION ${LIBVER}) +add_library(gnuradio-uhd SHARED ${gr_uhd_sources}) +target_link_libraries(gnuradio-uhd ${uhd_libs}) +set_target_properties(gnuradio-uhd PROPERTIES DEFINE_SYMBOL "gnuradio_uhd_EXPORTS") +set_target_properties(gnuradio-uhd PROPERTIES SOVERSION ${LIBVER}) -INSTALL(TARGETS gnuradio-uhd +install(TARGETS gnuradio-uhd LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "uhd_runtime" # .so/.dylib file ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "uhd_devel" # .lib file RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "uhd_runtime" # .dll file |