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-howto-write-a-block-cmake/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-howto-write-a-block-cmake/lib/CMakeLists.txt')
| -rw-r--r-- | gr-howto-write-a-block-cmake/lib/CMakeLists.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gr-howto-write-a-block-cmake/lib/CMakeLists.txt b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt index a2b6da950..21eb280da 100644 --- a/gr-howto-write-a-block-cmake/lib/CMakeLists.txt +++ b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt @@ -20,16 +20,16 @@ ######################################################################## # Setup library ######################################################################## -INCLUDE(GrPlatform) #define LIB_SUFFIX +include(GrPlatform) #define LIB_SUFFIX -ADD_LIBRARY(gnuradio-howto SHARED howto_square_ff.cc howto_square2_ff.cc) -TARGET_LINK_LIBRARIES(gnuradio-howto ${Boost_LIBRARIES} ${GRUEL_LIBRARIES} ${GNURADIO_CORE_LIBRARIES}) -SET_TARGET_PROPERTIES(gnuradio-howto PROPERTIES DEFINE_SYMBOL "gnuradio_howto_EXPORTS") +add_library(gnuradio-howto SHARED howto_square_ff.cc howto_square2_ff.cc) +target_link_libraries(gnuradio-howto ${Boost_LIBRARIES} ${GRUEL_LIBRARIES} ${GNURADIO_CORE_LIBRARIES}) +set_target_properties(gnuradio-howto PROPERTIES DEFINE_SYMBOL "gnuradio_howto_EXPORTS") ######################################################################## # Install built library files ######################################################################## -INSTALL(TARGETS gnuradio-howto +install(TARGETS gnuradio-howto LIBRARY DESTINATION lib${LIB_SUFFIX} # .so/.dylib file ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file RUNTIME DESTINATION bin # .dll file @@ -38,7 +38,7 @@ INSTALL(TARGETS gnuradio-howto ######################################################################## # Install public header files ######################################################################## -INSTALL(FILES +install(FILES howto_api.h howto_square_ff.h howto_square2_ff.h @@ -48,17 +48,17 @@ INSTALL(FILES ######################################################################## # Build and register unit test ######################################################################## -FIND_PACKAGE(Boost COMPONENTS unit_test_framework) +find_package(Boost COMPONENTS unit_test_framework) -INCLUDE(GrTest) -SET(GR_TEST_TARGET_DEPS gnuradio-howto) +include(GrTest) +set(GR_TEST_TARGET_DEPS gnuradio-howto) #turn each test cpp file into an executable with an int main() function -ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN) +add_definitions(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN) -ADD_EXECUTABLE(qa_howto_square_ff qa_howto_square_ff.cc) -TARGET_LINK_LIBRARIES(qa_howto_square_ff gnuradio-howto ${Boost_LIBRARIES}) +add_executable(qa_howto_square_ff qa_howto_square_ff.cc) +target_link_libraries(qa_howto_square_ff gnuradio-howto ${Boost_LIBRARIES}) GR_ADD_TEST(qa_howto_square_ff qa_howto_square_ff) -ADD_EXECUTABLE(qa_howto_square2_ff qa_howto_square2_ff.cc) -TARGET_LINK_LIBRARIES(qa_howto_square2_ff gnuradio-howto ${Boost_LIBRARIES}) +add_executable(qa_howto_square2_ff qa_howto_square2_ff.cc) +target_link_libraries(qa_howto_square2_ff gnuradio-howto ${Boost_LIBRARIES}) GR_ADD_TEST(qa_howto_square2_ff qa_howto_square2_ff) |