[hamradio-commits] [gnss-sdr] 202/303: Fix duplicate symbols

[Carles Fernandez]

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 98e2b58f02be0004081e95bdb1dfdc2a50ca7fbc
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Dec 26 01:16:24 2016 +0100

    Fix duplicate symbols
---
 .../libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
index 9038828..97847d5 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
@@ -542,11 +542,8 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.7")
     #Create a volk_gnsssdr object library (requires cmake >= 2.8.8)
     add_library(volk_gnsssdr_obj OBJECT ${volk_gnsssdr_sources})
     
-    if(ENABLE_STATIC_LIBS)
-        add_library(volk_gnsssdr STATIC $<TARGET_OBJECTS:volk_gnsssdr_obj> ${volk_gnsssdr_sources})
-    else(ENABLE_STATIC_LIBS)
-        add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj> ${volk_gnsssdr_sources})
-    endif(ENABLE_STATIC_LIBS)
+    #Add dynamic library
+    add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj>)
     target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries} ${Boost_LIBRARIES})
 
     #Configure target properties

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