[hamradio-commits] [gnss-sdr] 212/303: Fix build with static libs

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:36:02 UTC 2017


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

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

commit c3fd3ab581aab5463123a8905da7be67dd62bf7a
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Dec 26 14:05:25 2016 +0100

    Fix build with static libs
---
 .../libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
index 61368ed..40d38a9 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
@@ -91,8 +91,12 @@ endif()
 
 # MAKE volk_gnsssdr-config-info
 add_executable(volk_gnsssdr-config-info volk_gnsssdr-config-info.cc)
-target_link_libraries(volk_gnsssdr-config-info volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
-add_dependencies(volk_gnsssdr-config-info volk_gnsssdr)
+if(ENABLE_STATIC_LIBS)
+   target_link_libraries(volk_gnsssdr-config-info volk_gnsssdr_static ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+else(ENABLE_STATIC_LIBS)
+   target_link_libraries(volk_gnsssdr-config-info volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+   add_dependencies(volk_gnsssdr-config-info volk_gnsssdr)
+endif(ENABLE_STATIC_LIBS)
 
 if(ENABLE_STRIP)
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)

-- 
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