From: Kefu Chai <kchai@redhat.com>
Date: Wed, 7 Sep 2016 11:58:44 +0000 (+0800)
Subject: cmake: include(SIMDExt) in src/CMakeLists.txt
X-Git-Tag: v11.0.1~285^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11003%2Fhead;p=ceph.git

cmake: include(SIMDExt) in src/CMakeLists.txt

as we need to check HAVE_ARMV8_CRC in src/CMakeLists.txt.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3eed3d40f4f3..9a6948148812 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -467,6 +467,7 @@ set_source_files_properties(${CMAKE_SOURCE_DIR}/src/ceph_ver.c
   ${CMAKE_SOURCE_DIR}/src/test/encoding/ceph_dencoder.cc
   APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/src/include/ceph_ver.h)
 
+include(SIMDExt)
 if(HAVE_ARMV8_CRC)
   add_library(common_crc_aarch64 STATIC common/crc32c_aarch64.c)
   set_target_properties(common_crc_aarch64 PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARM_CRC_FLAGS}")
diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index 86ecbbc81332..d0941c112311 100644
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -7,8 +7,6 @@ include_directories(jerasure/jerasure/include)
 include_directories(jerasure/gf-complete/include)
 include_directories(jerasure)
 
-include(SIMDExt)
-
 if(TRUE)
   list(APPEND jerasure_flavors generic)
 endif()
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 93283537d09b..8c1c2814ad4b 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -363,8 +363,6 @@ target_link_libraries(ceph_multi_stress_watch librados global radostest
   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 #ceph_perf_local
-include(SIMDExt)
-
 add_executable(ceph_perf_local 
   perf_local.cc
   perf_helper.cc)