From 48435735bafa89aa775601e3d510d4b2b8ea0e74 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 19 May 2015 20:28:02 +0200 Subject: [PATCH] fixes parallel building when glog is auto-built --- src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt | 1 + src/utils/front-end-cal/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index e5cf494c2..2798f5b25 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -36,3 +36,4 @@ file(GLOB SIGNAL_SOURCE_GR_BLOCKS_HEADERS "*.h") add_library(signal_source_gr_blocks ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}) source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}) target_link_libraries(signal_source_gr_blocks signal_source_lib ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES}) +add_dependencies(signal_source_gr_blocks glog-${glog_RELEASE}) diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index aca25d72e..37639c0c8 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -54,6 +54,8 @@ gnss_rx gnss_sp_libs ) + + add_dependencies(front_end_cal_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE}) add_definitions( -DGNSS_SDR_VERSION="${VERSION}" ) add_definitions( -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" )