update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / compressor / zlib / CMakeLists.txt

diff --git a/ceph/src/compressor/zlib/CMakeLists.txt b/ceph/src/compressor/zlib/CMakeLists.txt
index 037416c3d7fc57998af32be1804a3f2ce929af39..51aba0834d356b4085ac0f3cfc8aaa0c90045c1f 100644 (file)
--- a/ceph/src/compressor/zlib/CMakeLists.txt
+++ b/ceph/src/compressor/zlib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # zlib
 
-if(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64)
+if(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
        set(zlib_sources
          CompressionPluginZlib.cc
          ZlibCompressor.cc
@@ -30,17 +30,16 @@ if(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64)
          ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/proc_heap.asm
          ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/rfc1951_lookup.asm
        )
-else(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64)
+else(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
        set(zlib_sources
          CompressionPluginZlib.cc
          ZlibCompressor.cc
        )
-endif(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64)
+endif(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
 
 add_library(ceph_zlib SHARED ${zlib_sources})
-add_dependencies(ceph_zlib ${CMAKE_SOURCE_DIR}/src/ceph_ver.h)
-target_link_libraries(ceph_zlib ${ZLIB_LIBRARIES})
-target_include_directories(ceph_zlib PRIVATE "${CMAKE_SOURCE_DIR}/src/isa-l/include")
+target_link_libraries(ceph_zlib ZLIB::ZLIB)
+target_include_directories(ceph_zlib SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/isa-l/include")
 set_target_properties(ceph_zlib PROPERTIES
   VERSION 2.0.0
   SOVERSION 2