celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [3/3] celix git commit: CELIX-426: Adds required linker options for the depenedency managet on OSX systems
Date Sun, 27 May 2018 15:10:36 GMT
CELIX-426: Adds required linker options for the depenedency managet on OSX systems


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/d44047d2
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/d44047d2
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/d44047d2

Branch: refs/heads/develop
Commit: d44047d201007c94179e26a983ba726b9b2d3135
Parents: 8e71674
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Sun May 27 17:09:43 2018 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Sun May 27 17:09:43 2018 +0200

----------------------------------------------------------------------
 dependency_manager/CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/d44047d2/dependency_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dependency_manager/CMakeLists.txt b/dependency_manager/CMakeLists.txt
index a95a36b..52051ab 100644
--- a/dependency_manager/CMakeLists.txt
+++ b/dependency_manager/CMakeLists.txt
@@ -21,14 +21,22 @@ target_include_directories(dependency_manager_static PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api>
         $<INSTALL_INTERFACE:include/celix/dependency_manager>
 )
-target_link_libraries(dependency_manager_static PUBLIC Celix::framework)
+if (APPLE)
+    target_link_libraries(dependency_manager_static Celix::framework "-undefined dynamic_lookup")
+else()
+    target_link_libraries(dependency_manager_static Celix::framework)
+endif()
 
 add_library(dependency_manager_so SHARED src/dm_activator.c)
 target_include_directories(dependency_manager_so PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api>
         $<INSTALL_INTERFACE:include/celix/dependency_manager>
 )
-target_link_libraries(dependency_manager_so PUBLIC Celix::framework)
+if (APPLE)
+    target_link_libraries(dependency_manager_so Celix::framework "-undefined dynamic_lookup")
+else()
+    target_link_libraries(dependency_manager_so Celix::framework)
+endif()
 
 #now part of the the shell bundle
 add_library(dm_shell INTERFACE)


Mime
View raw message