[hamradio-commits] [gnss-sdr] 85/149: fixes parallel building when volk_gnsssdr_module is already installed

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:43:06 UTC 2016


This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 7e52e3cf5b5c61f41d9452fcd2874c65635616e5
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Jan 19 19:43:09 2016 +0100

    fixes parallel building when volk_gnsssdr_module is already installed
---
 src/algorithms/tracking/libs/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 10c4b59..e113105 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -69,4 +69,10 @@ file(GLOB TRACKING_LIB_HEADERS "*.h")
 add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
 source_group(Headers FILES ${TRACKING_LIB_HEADERS})
 target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
-add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module)
+
+if(VOLK_GNSSSDR_FOUND)
+    add_dependencies(tracking_lib glog-${glog_RELEASE})
+else(VOLK_GNSSSDR_FOUND)
+    add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module)
+endif()
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git



More information about the pkg-hamradio-commits mailing list