mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-07-05 11:32:56 +00:00
Code Issues Releases Wiki Activity

Improve CMake scripts, add workaround for CentOS 7 and remove unused include

Browse Source
This commit is contained in:
Carles Fernandez 2020-08-09 21:44:35 +02:00
parent adcbacafb5
commit 0fbbdbb163
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/algorithms/signal_generator/adapters/CMakeLists.txt
View File

@ -26,11 +26,12 @@ endif()
target_link_libraries(signal_generator_adapters target_link_libraries(signal_generator_adapters
PUBLIC PUBLIC
Gnuradio::blocks Gnuradio::blocks
Gnuradio::pmt
signal_generator_gr_blocks signal_generator_gr_blocks
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
algorithms_libs core_system_parameters
) )
target_include_directories(signal_generator_adapters target_include_directories(signal_generator_adapters

19
src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
View File

@ -26,15 +26,10 @@ endif()
target_link_libraries(signal_generator_gr_blocks target_link_libraries(signal_generator_gr_blocks
PUBLIC PUBLIC
Gnuradio::runtime Gnuradio::runtime
core_system_parameters
PRIVATE PRIVATE
Volkgnsssdr::volkgnsssdr
algorithms_libs algorithms_libs
) core_system_parameters
Volkgnsssdr::volkgnsssdr
target_include_directories(signal_generator_gr_blocks
PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/libs
) )
if(GNURADIO_USES_STD_POINTERS) if(GNURADIO_USES_STD_POINTERS)
@ -43,6 +38,16 @@ if(GNURADIO_USES_STD_POINTERS)
) )
endif() endif()
# Workaround for CentOS 7
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND
(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0"))
target_compile_options(signal_generator_gr_blocks
PRIVATE
$<$<CONFIG:Release>:-O0>
$<$<CONFIG:RelWithDebInfo>:-O0>
)
endif()
if(ENABLE_CLANG_TIDY) if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE) if(CLANG_TIDY_EXE)
set_target_properties(signal_generator_gr_blocks set_target_properties(signal_generator_gr_blocks

1
src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
View File

@ -20,7 +20,6 @@
#ifndef GNSS_SDR_SIGNAL_GENERATOR_C_H #ifndef GNSS_SDR_SIGNAL_GENERATOR_C_H
#define GNSS_SDR_SIGNAL_GENERATOR_C_H #define GNSS_SDR_SIGNAL_GENERATOR_C_H
#include "gnss_signal.h"
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <random> #include <random>
#include <string> #include <string>