From: Kefu Chai <kchai@redhat.com>
Date: Sun, 5 Aug 2018 17:35:25 +0000 (+0800)
Subject: cmake: cleanup snappy related script
X-Git-Tag: v14.0.1~647^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c32c6e286bfb92bf95d7c45c5212d751ba958590;p=ceph-ci.git

cmake: cleanup snappy related script

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

diff --git a/cmake/modules/Findsnappy.cmake b/cmake/modules/Findsnappy.cmake
index 644eef33bc0..716ed1c819c 100644
--- a/cmake/modules/Findsnappy.cmake
+++ b/cmake/modules/Findsnappy.cmake
@@ -5,9 +5,9 @@
 # SNAPPY_LIBRARIES - List of libraries when using snappy.
 # SNAPPY_FOUND - True if snappy found.
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET REQUIRED)
 pkg_search_module(PC_snappy
-  QUIET snappy)
+  snappy QUIET)
 
 find_path(SNAPPY_INCLUDE_DIR
   NAMES snappy.h
@@ -22,8 +22,17 @@ find_library(SNAPPY_LIBRARIES
     ${SNAPPY_ROOT_DIR}/lib)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(snappy DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
+find_package_handle_standard_args(snappy
+  DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
 
 mark_as_advanced(
   SNAPPY_LIBRARIES
   SNAPPY_INCLUDE_DIR)
+
+if(snappy_FOUND AND NOT (TARGET snappy::snappy))
+  add_library(snappy::snappy UNKNOWN IMPORTED)
+  set_target_properties(snappy::snappy PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SNAPPY_INCLUDE_DIR}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+    IMPORTED_LOCATION "${SNAPPY_LIBRARIES}")
+endif()
diff --git a/src/compressor/snappy/CMakeLists.txt b/src/compressor/snappy/CMakeLists.txt
index 7b38794c496..05df62024ca 100644
--- a/src/compressor/snappy/CMakeLists.txt
+++ b/src/compressor/snappy/CMakeLists.txt
@@ -7,7 +7,7 @@ set(snappy_sources
 add_library(ceph_snappy SHARED ${snappy_sources})
 target_include_directories(ceph_snappy SYSTEM PRIVATE
   "${SNAPPY_INCLUDE_DIR}")
-target_link_libraries(ceph_snappy ${SNAPPY_LIBRARIES})
+target_link_libraries(ceph_snappy snappy::snappy)
 set_target_properties(ceph_snappy PROPERTIES
   VERSION 2.0.0
   SOVERSION 2