mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-30 14:53:03 +00:00
Code Issues Releases Wiki Activity

Make use of target_sources(), make use of target propagation to reduce redundancy in dependencies, some fixes for Clang and CMake < 3.11. Use generic lambdas with auto

Browse Source
This commit is contained in:
Carles Fernandez
2020-06-08 20:04:01 +02:00
parent 7e0502362a
commit 2a3d682f1f
88 changed files with 801 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/algorithms/signal_source/adapters/CMakeLists.txt
View File

@@ -125,12 +125,21 @@ set(SIGNAL_SOURCE_ADAPTER_HEADERS
list(SORT SIGNAL_SOURCE_ADAPTER_HEADERS)
list(SORT SIGNAL_SOURCE_ADAPTER_SOURCES)
source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS})
add_library(signal_source_adapters
${SIGNAL_SOURCE_ADAPTER_SOURCES}
${SIGNAL_SOURCE_ADAPTER_HEADERS}
)
if(CMAKE_VERSION VERSION_GREATER 3.13)
add_library(signal_source_adapters STATIC)
target_sources(signal_source_adapters
PRIVATE
${SIGNAL_SOURCE_ADAPTER_SOURCES}
PUBLIC
${SIGNAL_SOURCE_ADAPTER_HEADERS}
)
else()
source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS})
add_library(signal_source_adapters
${SIGNAL_SOURCE_ADAPTER_SOURCES}
${SIGNAL_SOURCE_ADAPTER_HEADERS}
)
endif()
target_include_directories(signal_source_adapters
PUBLIC
@@ -140,14 +149,11 @@ target_include_directories(signal_source_adapters
target_link_libraries(signal_source_adapters
PUBLIC
Boost::headers
Gnuradio::runtime
Gnuradio::blocks
signal_source_gr_blocks
signal_source_libs
PRIVATE
gnss_sdr_flags
core_system_parameters
Gflags::gflags
Glog::glog
Volk::volk
)

24
src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
View File

@@ -43,18 +43,26 @@ set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS
list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS)
list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES)
source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
add_library(signal_source_gr_blocks
${SIGNAL_SOURCE_GR_BLOCKS_SOURCES}
${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}
)
if(CMAKE_VERSION VERSION_GREATER 3.13)
add_library(signal_source_gr_blocks STATIC)
target_sources(signal_source_gr_blocks
PRIVATE
${SIGNAL_SOURCE_GR_BLOCKS_SOURCES}
PUBLIC
${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}
)
else()
source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
add_library(signal_source_gr_blocks
${SIGNAL_SOURCE_GR_BLOCKS_SOURCES}
${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}
)
endif()
target_link_libraries(signal_source_gr_blocks
PUBLIC
signal_source_libs
Boost::thread
Gnuradio::runtime
PRIVATE
core_libs
Gflags::gflags
@@ -110,7 +118,7 @@ if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
)
endif()
if(CMAKE_VERSION VERSION_GREATER 3.1)
if(CMAKE_VERSION VERSION_GREATER 3.1 AND NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)))
set(has_generic_lambdas HAS_GENERIC_LAMBDA=1)
set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0)
target_compile_definitions(signal_source_gr_blocks

18
src/algorithms/signal_source/libs/CMakeLists.txt
View File

@@ -36,9 +36,21 @@ set(SIGNAL_SOURCE_LIB_HEADERS
list(SORT SIGNAL_SOURCE_LIB_HEADERS)
list(SORT SIGNAL_SOURCE_LIB_SOURCES)
source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
add_library(signal_source_libs ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
if(CMAKE_VERSION VERSION_GREATER 3.13)
add_library(signal_source_libs STATIC)
target_sources(signal_source_libs
PRIVATE
${SIGNAL_SOURCE_LIB_SOURCES}
PUBLIC
${SIGNAL_SOURCE_LIB_HEADERS}
)
else()
source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
add_library(signal_source_libs
${SIGNAL_SOURCE_LIB_SOURCES}
${SIGNAL_SOURCE_LIB_HEADERS}
)
endif()
target_link_libraries(signal_source_libs
PUBLIC