[hamradio-commits] [gnss-sdr] 56/149: fixes for MacOS

[Carles Fernandez]

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 bbdf52dbedd2f9a7f7337350b213589c2f30a876
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Jan 13 11:04:32 2016 +0100

    fixes for MacOS
---
 .../volk_gnsssdr/apps/CMakeLists.txt               | 22 +++++++++-------------
 .../volk_gnsssdr/lib/CMakeLists.txt                | 12 +++++-------
 2 files changed, 14 insertions(+), 20 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 b10d454..a0dcbc0 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
@@ -53,21 +53,17 @@ add_executable(volk_gnsssdr_profile
     ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
 )
 
-
-
-
-if(OS_IS_MACOSX)
-    target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
-elseif(OS_IS_MACOSX)
-    if(ENABLE_STATIC_LIBS)
-        target_link_libraries(volk_gnsssdr_profile volk_gnsssdr_static ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+if(ENABLE_STATIC_LIBS)
+    target_link_libraries(volk_gnsssdr_profile volk_gnsssdr_static ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+    if(NOT APPLE)
         set_target_properties(volk_gnsssdr_profile PROPERTIES LINK_FLAGS "-static")
-    else(ENABLE_STATIC_LIBS)
-        target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
-    endif(ENABLE_STATIC_LIBS)
-endif(OS_IS_MACOSX)
+    endif(NOT APPLE)
+    add_dependencies(volk_gnsssdr_profile volk_gnsssdr-static)
+else(ENABLE_STATIC_LIBS)
+    target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
+    add_dependencies(volk_gnsssdr_profile volk_gnsssdr)
+endif(ENABLE_STATIC_LIBS)
 
-add_dependencies(volk_gnsssdr_profile volk_gnsssdr)
 
 if(ENABLE_STRIP)
     if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
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 292cb54..183e41b 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
@@ -533,22 +533,20 @@ if(MSVC)
     set_source_files_properties(${volk_gnsssdr_sources} PROPERTIES LANGUAGE CXX)
 endif()
 
-message("+++++++++++++++++ ${volk_gnsssdr_sources}")
-
 #Use object library for faster overall build in newer versions of cmake
 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})
 
     #Add dynamic library
-    #add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj>)
+    add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj>)
     file(GLOB orc ${CMAKE_SOURCE_DIR}/kernels/volk_gnsssdr/asm/orc/*.orc)
     
     if(ENABLE_STATIC_LIBS)
-    add_library(volk_gnsssdr STATIC $<TARGET_OBJECTS:volk_gnsssdr_obj> ${orc} ${h_files})
-else(ENABLE_STATIC_LIBS)
-    add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj> ${orc} ${h_files})
-endif(ENABLE_STATIC_LIBS)
+        add_library(volk_gnsssdr STATIC $<TARGET_OBJECTS:volk_gnsssdr_obj> ${orc} )
+    else(ENABLE_STATIC_LIBS)
+        add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj> ${orc})
+    endif(ENABLE_STATIC_LIBS)
     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