From: Kefu Chai <kchai@redhat.com>
Date: Sun, 10 Sep 2017 04:35:46 +0000 (+0800)
Subject: cmake: do not pass --exclude-libs on osx
X-Git-Tag: v13.0.1~880^2~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a921f0663c3a887b24d275a8605027bdc3917ecc;p=ceph-ci.git

cmake: do not pass --exclude-libs on osx

it is not supported by osx linker

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7694fa751a7..62e76c6e15d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -994,14 +994,16 @@ if(WITH_LIBCEPHFS)
   target_link_libraries(cephfs LINK_PRIVATE client ceph-common
     ${CRYPTO_LIBS} ${EXTRALIBS})
   if(ENABLE_SHARED)
-    foreach(name ceph-common client osdc)
-      set(CEPHFS_LINK_FLAGS "${CEPHFS_LINK_FLAGS} -Wl,--exclude-libs,lib${name}.a")
-    endforeach()
     set_target_properties(cephfs PROPERTIES
       OUTPUT_NAME cephfs
       VERSION 2.0.0
-      SOVERSION 2
-      LINK_FLAGS ${CEPHFS_LINK_FLAGS})
+      SOVERSION 2)
+    if(NOT APPLE)
+      foreach(name ceph-common client osdc)
+        set_property(TARGET cephfs APPEND_STRING PROPERTY
+          LINK_FLAGS " -Wl,--exclude-libs,lib${name}.a")
+      endforeach()
+    endif()
   endif(ENABLE_SHARED)
   install(TARGETS cephfs DESTINATION ${CMAKE_INSTALL_LIBDIR})
   install(DIRECTORY
diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt
index d8b48256e94..406cf661ac0 100644
--- a/src/librados/CMakeLists.txt
+++ b/src/librados/CMakeLists.txt
@@ -28,8 +28,11 @@ if(ENABLE_SHARED)
     # use COMPILE_FLAGS for the backward compatibility with cmake 2.8.11, should have been:
     #  CXX_VISIBILITY_PRESET hidden
     #  VISIBILITY_INLINES_HIDDEN ON
-    COMPILE_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden"
-    LINK_FLAGS "-Wl,--exclude-libs,ALL")
+    COMPILE_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden")
+  if(NOT APPLE)
+    set_property(TARGET librados APPEND_STRING PROPERTY
+      LINK_FLAGS " -Wl,--exclude-libs,ALL")
+  endif()
 else(ENABLE_SHARED)
   add_library(librados ALIAS rados_a)
 endif(ENABLE_SHARED)
diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
index e596bd5f499..56c8dbc2433 100644
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@ -136,8 +136,11 @@ if(ENABLE_SHARED)
     OUTPUT_NAME rbd
     VERSION 1.12.0
     SOVERSION 1
-    COMPILE_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden"
-    LINK_FLAGS "-Wl,--exclude-libs,ALL")
+    COMPILE_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden")
+    if(NOT APPLE)
+      set_property(TARGET librbd APPEND_STRING PROPERTY
+        LINK_FLAGS " -Wl,--exclude-libs,ALL")
+    endif()
 endif(ENABLE_SHARED)
 install(TARGETS librbd DESTINATION ${CMAKE_INSTALL_LIBDIR})