update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / crypto / isa-l / CMakeLists.txt

diff --git a/ceph/src/crypto/isa-l/CMakeLists.txt b/ceph/src/crypto/isa-l/CMakeLists.txt
index 05022e95f81562c8e77fa4b8bdcb394b0a16f2cf..2a2ec0bc0cb286f897779f9f5de080be46e14306 100644 (file)
--- a/ceph/src/crypto/isa-l/CMakeLists.txt
+++ b/ceph/src/crypto/isa-l/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(isal_dir ${CMAKE_SOURCE_DIR}/src/crypto/isa-l/isa-l_crypto)
+set(CMAKE_ASM_FLAGS "-i ${isal_dir}/aes/ -i ${isal_dir}/include/ ${CMAKE_ASM_FLAGS}")
 
 set(isal_crypto_plugin_srcs
   isal_crypto_accel.cc 
@@ -22,12 +23,9 @@ set(isal_crypto_plugin_srcs
   ${isal_dir}/aes/cbc_enc_256_x4_sb.asm
   ${isal_dir}/aes/cbc_enc_256_x8_sb.asm)
 
-add_library(isal_crypto_plugin_objs OBJECT ${isal_crypto_plugin_srcs})
-target_include_directories(isal_crypto_plugin_objs PRIVATE ${isal_dir}/include)
-
-if(HAVE_GOOD_YASM_ELF64)
+if(HAVE_NASM_X64)
 add_dependencies(crypto_plugins ceph_crypto_isal)
-endif(HAVE_GOOD_YASM_ELF64)
+endif(HAVE_NASM_X64)
 
 add_library(ceph_crypto_isal SHARED ${isal_crypto_plugin_srcs})
 target_include_directories(ceph_crypto_isal PRIVATE ${isal_dir}/include)