diff options
Diffstat (limited to 'gr-analog/lib')
| -rw-r--r-- | gr-analog/lib/CMakeLists.txt | 75 |
1 files changed, 17 insertions, 58 deletions
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index 684fee4666..9b20f4ac90 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2012-2014 Free Software Foundation, Inc. +# Copyright 2012-2014,2019 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -18,31 +18,10 @@ # Boston, MA 02110-1301, USA. ######################################################################## -# Setup the include and linker paths -######################################################################## -include_directories( - ${CMAKE_CURRENT_BINARY_DIR}/../include - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${GR_ANALOG_INCLUDE_DIRS} - ${GR_FILTER_INCLUDE_DIRS} - ${GR_FFT_INCLUDE_DIRS} - ${GR_BLOCKS_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${VOLK_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} -) - -link_directories(${Boost_LIBRARY_DIRS}) - -if(ENABLE_GR_CTRLPORT) - ADD_DEFINITIONS(-DGR_CTRLPORT) -endif(ENABLE_GR_CTRLPORT) - -######################################################################## # Setup library ######################################################################## -list(APPEND analog_sources + +add_library(gnuradio-analog cpm.cc squelch_base_cc_impl.cc squelch_base_ff_impl.cc @@ -73,7 +52,17 @@ list(APPEND analog_sources random_uniform_source_impl.cc sig_source_impl.cc simple_squelch_cc_impl.cc + ) +target_link_libraries(gnuradio-analog PUBLIC + gnuradio-runtime + gnuradio-blocks + gnuradio-filter ) +target_include_directories(gnuradio-analog + PUBLIC + $<INSTALL_INTERFACE:include> + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> + ) #Add Windows DLL resource file if using MSVC IF(MSVC) @@ -84,40 +73,15 @@ IF(MSVC) ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-analog.rc @ONLY) - list(APPEND analog_sources + target_sources(gnuradio-analog PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-analog.rc ) ENDIF(MSVC) -list(APPEND analog_libs - gnuradio-runtime - gnuradio-blocks - gnuradio-filter - ${VOLK_LIBRARIES} - ${Boost_LIBRARIES} -) - -add_library(gnuradio-analog SHARED ${analog_sources}) -target_link_libraries(gnuradio-analog ${analog_libs}) -GR_LIBRARY_FOO(gnuradio-analog) -add_dependencies(gnuradio-analog gnuradio-filter) - -if(ENABLE_STATIC_LIBS) - add_library(gnuradio-analog_static STATIC ${analog_sources}) - - add_dependencies(gnuradio-analog_static - gnuradio-filter_static) - - if(NOT WIN32) - set_target_properties(gnuradio-analog_static - PROPERTIES OUTPUT_NAME gnuradio-analog) - endif(NOT WIN32) - - install(TARGETS gnuradio-analog_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file - ) -endif(ENABLE_STATIC_LIBS) +if(BUILD_SHARED_LIBS) + GR_LIBRARY_FOO(gnuradio-analog) +endif() ######################################################################## # QA C++ Code for gr-analog @@ -125,11 +89,6 @@ endif(ENABLE_STATIC_LIBS) if(ENABLE_TESTING) include(GrTest) - include_directories( - ${GR_ANALOG_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ) - list(APPEND test_gr_analog_sources ) list(APPEND GR_TEST_TARGET_DEPS gnuradio-analog) |