From 10d06eb115083c07a2203250237561f774d24902 Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Thu, 22 Sep 2016 12:41:58 -0700 Subject: [PATCH] cmake: normalize use of SIMD flags Signed-off-by: Bassam Tabbara --- cmake/modules/SIMDExt.cmake | 3 --- src/compressor/zlib/CMakeLists.txt | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmake/modules/SIMDExt.cmake b/cmake/modules/SIMDExt.cmake index df3ad3b9ab36d..378e2f843c45e 100644 --- a/cmake/modules/SIMDExt.cmake +++ b/cmake/modules/SIMDExt.cmake @@ -11,8 +11,6 @@ # HAVE_INTEL_SSE4_1 # HAVE_INTEL_SSE4_2 # -# INTEL_SSE4_1 -# # SIMD_COMPILE_FLAGS # @@ -51,7 +49,6 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") if(HAVE_INTEL_PCLMUL) set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul") endif() - CHECK_C_COMPILER_FLAG(-msse4.1 INTEL_SSE4_1) CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1) if(HAVE_INTEL_SSE4_1) set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1") diff --git a/src/compressor/zlib/CMakeLists.txt b/src/compressor/zlib/CMakeLists.txt index 280962ad42d2f..72d6086d383d4 100644 --- a/src/compressor/zlib/CMakeLists.txt +++ b/src/compressor/zlib/CMakeLists.txt @@ -1,6 +1,6 @@ # zlib -if(INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64) +if(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64) set(zlib_sources CompressionPluginZlib.cc ZlibCompressor.cc @@ -20,12 +20,12 @@ if(INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64) ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_stateless_base.c ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_base.c ) -else(INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64) +else(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64) set(zlib_sources CompressionPluginZlib.cc ZlibCompressor.cc ) -endif(INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64) +endif(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64) add_library(ceph_zlib SHARED ${zlib_sources}) add_dependencies(ceph_zlib ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) -- 2.39.5