]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
CMake: For CMake version <= 2.8.11, use LINK_{PRIVATE,PUBLIC} instead of PRIVATE... 7474/head
authorchangtao <changtao@hihuron.com>
Tue, 2 Feb 2016 11:47:53 +0000 (19:47 +0800)
committerchangtao <changtao@hihuron.com>
Wed, 3 Feb 2016 16:16:43 +0000 (00:16 +0800)
Signed-off-by: Tao Chang <changtao@hihuron.com>
src/CMakeLists.txt
src/rbd_replay/CMakeLists.txt

index a6d83c2ba2f86d636e5859003359c28014421d23..4327a17fd6a6293d5d2f9d2862825047fa02e619 100644 (file)
@@ -411,11 +411,12 @@ add_library(librados ${CEPH_SHARED} ${librados_srcs}
   $<TARGET_OBJECTS:heap_profiler_objs>
   $<TARGET_OBJECTS:common_util_obj>)
 add_dependencies(librados osdc)
-target_link_libraries(librados PRIVATE osdc osd os global common cls_lock_client
+# LINK_PRIVATE instead of PRIVATE is used to backward compatibility with cmake 2.8.11
+target_link_libraries(librados LINK_PRIVATE osdc osd os global common cls_lock_client
   ${BLKID_LIBRARIES}
   ${CRYPTO_LIBS} ${EXTRALIBS} ${ALLOC_LIBS})
 if(${WITH_LTTNG})
-  target_link_libraries(librados PUBLIC librados_tp)
+  target_link_libraries(librados librados_tp)
 endif(${WITH_LTTNG})
 if(${ENABLE_SHARED})
   set_target_properties(librados PROPERTIES OUTPUT_NAME rados VERSION 2.0.0
@@ -910,7 +911,7 @@ if(WITH_LIBCEPHFS)
     $<TARGET_OBJECTS:cls_references_objs>
     $<TARGET_OBJECTS:heap_profiler_objs>
     $<TARGET_OBJECTS:common_util_obj>)
-  target_link_libraries(cephfs PRIVATE client osdc osd os global common cls_lock_client
+  target_link_libraries(cephfs LINK_PRIVATE client osdc osd os global common cls_lock_client
     ${BLKID_LIBRARIES}
     ${CRYPTO_LIBS} ${EXTRALIBS} ${ALLOC_LIBS})
 if(${ENABLE_SHARED})
@@ -1023,11 +1024,11 @@ if(${WITH_RBD})
   add_library(librbd ${CEPH_SHARED} ${librbd_srcs}
     $<TARGET_OBJECTS:osdc_rbd_objs>
     $<TARGET_OBJECTS:common_util_obj>)
-  target_link_libraries(librbd PRIVATE librados common journal
+  target_link_libraries(librbd LINK_PRIVATE librados common journal
     cls_lock_client cls_rbd_client cls_journal_client udev
     ${CMAKE_DL_LIBS})
   if(${WITH_LTTNG})
-    target_link_libraries(librbd PUBLIC librbd_tp)
+    target_link_libraries(librbd librbd_tp)
   endif(${WITH_LTTNG})
   if(${ENABLE_SHARED})
     set_target_properties(librbd PROPERTIES VERSION "1.0.0" SOVERSION "1"
index b6608f031da7d94d7b5acf4590084e2bfd6d67c0..6d3d0a47645e1c5df868dd3a04df029bf9d4042e 100644 (file)
@@ -10,7 +10,7 @@ set(librbd_replay_srcs
     rbd_loc.cc
     Replayer.cc)
 add_library(rbd_replay STATIC ${librbd_replay_srcs})
-target_link_libraries(rbd_replay PRIVATE librbd librados global)
+target_link_libraries(rbd_replay LINK_PRIVATE librbd librados global)
 
 add_executable(rbd-replay
   rbd-replay.cc