diff options
| author | Andrej Rode <mail@andrejro.de> | 2019-03-02 19:59:00 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus.mueller@ettus.com> | 2019-03-04 22:30:37 +0100 |
| commit | ab2fb35677e38a384df3f9503d1f45f64bbc0374 (patch) | |
| tree | c59965a71d4951e9bcae9efcf9a6005df2f340a1 /gr-blocks/lib | |
| parent | 4e777f1c0ee28011255e3b6b703463cef0f207e0 (diff) | |
cmake: Update to modern CMake usage
This includes using target based setting of includes
and link libraries. This will transitively add the includes
and linking flags to dependent targets.
This is still a work in progress since only the dynamic
libraries have been touched and not all of include_directories
directives are gone yet.
cmake: remove GR_INCLUDE_SUBDIRECTORY macro
Previously this macro was used to inject subdirectories in the
current CMake namespace. This is generally undesired and pollutes the
current context.
previously GNU Radio CMake had a non-default option ENABLE_STATIC_LIBS
to build both, shared libraries and static libraries.
This seems to be a construction taken over from autotools and serves
no purpuose in CMake and complicates the library building.
cmake: remove GR_LIBTOOL and la generation support
This looks like it was primarily used to support projects using
autotools, but comments state that the generated .la files aren't
compatible with autotools anyway.
cmake: Bump required CMake version to 3.8
UseSWIG cmake uses syntax which requires at least CMake 3.8 and is non-trivial
to change
Diffstat (limited to 'gr-blocks/lib')
| -rw-r--r-- | gr-blocks/lib/CMakeLists.txt | 98 |
1 files changed, 20 insertions, 78 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index dda5c395cb..7ee527d2fb 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2012-2014,2018 Free Software Foundation, Inc. +# Copyright 2012-2014,2018-2019 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,27 +23,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake) ######################################################################## -# Setup the include and linker paths -######################################################################## -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../include - ${GR_BLOCKS_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_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 gr_blocks_sources +add_library(gnuradio-blocks abs_blk_impl.cc add_blk_impl.cc add_const_v_impl.cc @@ -197,12 +179,23 @@ list(APPEND gr_blocks_sources vector_to_streams_impl.cc wavfile_sink_impl.cc wavfile_source_impl.cc -) + ) + +target_link_libraries(gnuradio-blocks + gnuradio-runtime + ${GR_VOLK_LIB} + ) + +target_include_directories(gnuradio-blocks + PUBLIC + $<INSTALL_INTERFACE:include> + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> + ) set_source_files_properties(file_source_impl.cc PROPERTIES COMPILE_FLAGS -D_FILE_OFFSET_BITS=64) if(ENABLE_GR_CTRLPORT) -list(APPEND blocks_ctrlport_sources +target_sources(gnuradio-blocks PRIVATE ctrlport_probe_c_impl.cc ctrlport_probe2_c_impl.cc ctrlport_probe2_f_impl.cc @@ -210,11 +203,7 @@ list(APPEND blocks_ctrlport_sources ctrlport_probe2_i_impl.cc ctrlport_probe2_b_impl.cc ) - -list(APPEND gr_blocks_sources - ${blocks_ctrlport_sources} -) -endif(ENABLE_GR_CTRLPORT) +endif() #Add Windows DLL resource file if using MSVC IF(MSVC) @@ -225,54 +214,14 @@ IF(MSVC) ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-blocks.rc @ONLY) - list(APPEND gr_blocks_sources + target_sources(gnuradio-blocks PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-blocks.rc ) ENDIF(MSVC) -list(APPEND blocks_libs - gnuradio-runtime - ${VOLK_LIBRARIES} - ${Boost_LIBRARIES} -) - -add_library(gnuradio-blocks SHARED ${gr_blocks_sources}) - -target_link_libraries(gnuradio-blocks ${blocks_libs}) -GR_LIBRARY_FOO(gnuradio-blocks) - -if(ENABLE_STATIC_LIBS) - # Remove controlport-specific source files from staticlibs build - if(ENABLE_GR_CTRLPORT) - if(ICE_FOUND) - list(REMOVE_ITEM gr_blocks_sources - ${blocks_ctrlport_sources} - ) - - # Remove GR_CTRLPORT set this target's definitions. - # Makes sure we don't try to use ControlPort stuff in source files - GET_DIRECTORY_PROPERTY(STATIC_DEFS COMPILE_DEFINITIONS) - list(REMOVE_ITEM STATIC_DEFS "GR_CTRLPORT") - SET_PROPERTY(DIRECTORY PROPERTY COMPILE_DEFINITIONS "${STATIC_DEFS}") - - # readd it to the target since we removed it from the directory-wide list. - SET_PROPERTY(TARGET gnuradio-blocks APPEND PROPERTY COMPILE_DEFINITIONS "GR_CTRLPORT") - endif(ICE_FOUND) - endif(ENABLE_GR_CTRLPORT) - - add_library(gnuradio-blocks_static STATIC ${gr_blocks_sources}) - - add_dependencies(gnuradio-blocks_static) - - if(NOT WIN32) - set_target_properties(gnuradio-blocks_static - PROPERTIES OUTPUT_NAME gnuradio-blocks) - endif(NOT WIN32) - - install(TARGETS gnuradio-blocks_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file - ) -endif(ENABLE_STATIC_LIBS) +if(BUILD_SHARED_LIBS) + GR_LIBRARY_FOO(gnuradio-blocks) +endif() ######################################################################## # QA C++ Code for gr-blocks @@ -280,11 +229,6 @@ endif(ENABLE_STATIC_LIBS) if(ENABLE_TESTING) include(GrTest) - include_directories( - ${GR_BLOCKS_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ) - list(APPEND test_gr_blocks_sources qa_block_tags.cc qa_gr_block.cc @@ -296,8 +240,6 @@ if(ENABLE_TESTING) qa_set_msg_handler.cc ) list(APPEND GR_TEST_TARGET_DEPS gnuradio-blocks - ${Boost_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ) foreach(qa_file ${test_gr_blocks_sources}) |