From 3f27dbbdb0c5750bc75e650bf85ae90d56136d31 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 13 Oct 2017 13:46:34 +0800 Subject: [PATCH] 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 --- CMakeLists.txt | 9 --------- src/CMakeLists.txt | 2 +- src/java/native/CMakeLists.txt | 2 +- src/librados/CMakeLists.txt | 3 +-- src/librbd/CMakeLists.txt | 4 ++-- src/os/CMakeLists.txt | 2 +- src/rbd_replay/CMakeLists.txt | 2 +- src/rgw/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5ddc3455f8..68e0d9fdea8 100644 --- 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 02641dcb24b..16ea6876ec9 100644 --- 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 d7d633b3d7e..2c6067b6087 100644 --- 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 406cf661ac0..634893916f7 100644 --- a/src/librados/CMakeLists.txt +++ b/src/librados/CMakeLists.txt @@ -18,8 +18,7 @@ if(ENABLE_SHARED) $ $ $) - # 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 56c8dbc2433..a34f14f3bfc 100644 --- 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 ff844c40422..ad2940449ac 100644 --- 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 2e2e176d80b..e9d3804c5f5 100644 --- 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 506e3b027bd..8aa91b3fc03 100644 --- 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 -- 2.39.5