From d4da5d28796e668febaebcc637d87f7362bb8027 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 3 Feb 2019 20:28:49 +0100 Subject: [PATCH] Add Gflags::gflags private target --- src/algorithms/signal_source/adapters/CMakeLists.txt | 3 +-- .../signal_source/gnuradio_blocks/CMakeLists.txt | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index d13ecc361..070029cbc 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -197,7 +197,6 @@ set(SIGNAL_SOURCE_ADAPTER_HEADERS ${OPT_DRIVER_HEADERS} ) - if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) set(SIGNAL_SOURCE_ADAPTER_SOURCES ${SIGNAL_SOURCE_ADAPTER_SOURCES} two_bit_cpx_file_signal_source.cc @@ -226,7 +225,6 @@ target_link_libraries(signal_source_adapters Boost::boost Gnuradio::runtime signal_source_gr_blocks - ${Boost_LIBRARIES} ${GNURADIO_PMT_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${OPT_LIBRARIES} @@ -234,6 +232,7 @@ target_link_libraries(signal_source_adapters gnss_rx signal_source_lib PRIVATE + Gflags::gflags Glog::glog Volk::volk ) diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index 442701bb2..5cc96054c 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -57,12 +57,6 @@ set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS include_directories( - #${CMAKE_CURRENT_SOURCE_DIR} - #${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs - #${GLOG_INCLUDE_DIRS} - #${GFlags_INCLUDE_DIRS} - #${GNURADIO_RUNTIME_INCLUDE_DIRS} - #${Boost_INCLUDE_DIRS} ${OPT_DRIVER_INCLUDE_DIRS} ) @@ -83,6 +77,7 @@ target_link_libraries(signal_source_gr_blocks Boost::thread ${OPT_LIBRARIES} PRIVATE + Gflags::gflags Glog::glog )