cmake: s/LINK_PRIVATE/PRIVATE/

as 2.8.12 is required not, no need to be compatible with 2.8.11 anymore.

this reverts 457f023.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5ddc3455f82015455c8e70e2e785ed4fee85e57..68e0d9fdea826c2ff6f092478989b7a15c4bd2e1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,15 +7,6 @@ if(POLICY CMP0046)
   # Tweak policies (this one disables "missing" dependency warning)
   cmake_policy(SET CMP0046 OLD)
 endif()
-# we use LINK_PRIVATE keyword instead of PRIVATE, but do not specify the LINK_PUBLIC
-# for target_link_libraries() command when PUBLIC should be used instead, it's just
-# for backward compatibility with cmake 2.8.11.
-if (POLICY CMP0022)
-cmake_policy(SET CMP0022 OLD)
-endif (POLICY CMP0022)
-if (POLICY CMP0023)
-cmake_policy(SET CMP0023 OLD)
-endif (POLICY CMP0023)
 if(POLICY CMP0056)
   cmake_policy(SET CMP0056 NEW)
 endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 02641dcb24b15ea3113978a9e7b6ba57278e0e3e..16ea6876ec97eda1a2754eb4ddfc3d9b77fcc2c5 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -957,7 +957,7 @@ add_subdirectory(client)
 if(WITH_LIBCEPHFS)
   set(libcephfs_srcs libcephfs.cc)
   add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs})
-  target_link_libraries(cephfs LINK_PRIVATE client ceph-common
+  target_link_libraries(cephfs PRIVATE client ceph-common
     ${CRYPTO_LIBS} ${EXTRALIBS})
   if(ENABLE_SHARED)
     set_target_properties(cephfs PROPERTIES

diff --git a/src/java/native/CMakeLists.txt b/src/java/native/CMakeLists.txt
index d7d633b3d7ecd4975fef050a5466ba885139711a..2c6067b60874f062341e484d2bbbdb80e38a574c 100644 (file)
--- a/src/java/native/CMakeLists.txt
+++ b/src/java/native/CMakeLists.txt
@@ -8,7 +8,7 @@ set_target_properties(cephfs_jni PROPERTIES
   SOVERSION 1)
 add_dependencies(cephfs_jni jni-header)
 include_directories(${JNI_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(cephfs_jni LINK_PRIVATE cephfs ceph-common
+target_link_libraries(cephfs_jni PRIVATE cephfs ceph-common
   ${EXTRALIBS} ${JNI_LIBRARIES})
 install(TARGETS cephfs_jni
   DESTINATION ${CMAKE_INSTALL_LIBDIR})

diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt
index 406cf661ac0bac31b0aef50de63b59bae7a0e69f..634893916f78fc921804c9c9d457cb691fa04953 100644 (file)
--- a/src/librados/CMakeLists.txt
+++ b/src/librados/CMakeLists.txt
@@ -18,8 +18,7 @@ if(ENABLE_SHARED)
     $<TARGET_OBJECTS:librados_api_obj>
     $<TARGET_OBJECTS:librados_objs>
     $<TARGET_OBJECTS:common_buffer_obj>)
-  # LINK_PRIVATE instead of PRIVATE is used to backward compatibility with cmake 2.8.11
-  target_link_libraries(librados LINK_PRIVATE osdc ceph-common cls_lock_client
+  target_link_libraries(librados PRIVATE osdc ceph-common cls_lock_client
     ${BLKID_LIBRARIES} ${CRYPTO_LIBS} ${EXTRALIBS})
   set_target_properties(librados PROPERTIES
     OUTPUT_NAME rados

diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
index 56c8dbc243369b6dc16b456b80d0c635152f89f0..a34f14f3bfc989395d2573f0c0253bcbee4f5de7 100644 (file)
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@ -114,7 +114,7 @@ endif()
 add_library(librbd ${CEPH_SHARED}
   librbd.cc)
 
-target_link_libraries(librbd LINK_PRIVATE 
+target_link_libraries(librbd PRIVATE
   rbd_internal
   rbd_types
   journal
@@ -128,7 +128,7 @@ target_link_libraries(librbd LINK_PRIVATE
   ${CMAKE_DL_LIBS}
   ${EXTRALIBS})
 if(HAVE_UDEV)
-  target_link_libraries(librbd LINK_PRIVATE
+  target_link_libraries(librbd PRIVATE
     udev)
 endif()
 if(ENABLE_SHARED)

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index ff844c40422240a37d35c4cc6117c106dc615a21..ad2940449ac2018fd4088c89b18fa77a12a3d2d4 100644 (file)
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -133,7 +133,7 @@ if(WITH_SPDK)
   foreach(lib nvme log env_dpdk util)
     add_library(spdk_${lib} STATIC IMPORTED)
     add_dependencies(spdk_${lib} build_spdk)
-    target_link_libraries(os LINK_PRIVATE spdk_${lib})
+    target_link_libraries(os PRIVATE spdk_${lib})
     set_target_properties(spdk_${lib} PROPERTIES
       IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/src/spdk/build/lib/libspdk_${lib}.a"
       INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/spdk/include")

diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
index 2e2e176d80b389fb32eb21cfbbc87c465c1a1af4..e9d3804c5f57a3a282ca1903b4cc1b86c61c28ab 100644 (file)
--- a/src/rbd_replay/CMakeLists.txt
+++ b/src/rbd_replay/CMakeLists.txt
@@ -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 LINK_PRIVATE librbd librados global)
+target_link_libraries(rbd_replay PRIVATE librbd librados global)
 
 add_executable(rbd-replay
   rbd-replay.cc)

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 506e3b027bdae01d949a23039f9929c054bb7417..8aa91b3fc03169df26672d35478db835c37ac6d4 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -239,7 +239,7 @@ set(librgw_srcs
   librgw.cc
   rgw_file.cc)
 add_library(rgw SHARED ${librgw_srcs})
-target_link_libraries(rgw LINK_PRIVATE
+target_link_libraries(rgw PRIVATE
   rgw_a
   librados
   cls_rgw_client