From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 8 May 2018 18:22:42 +0000 (-0400)
Subject: cmake: move crypto_plugins target
X-Git-Tag: v14.0.0~171^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61516bcfac4dff53d0e24f6c4623127465c46d9d;p=ceph.git

cmake: move crypto_plugins target

the crypto_plugins target was defined in
src/crypto/isa-l/CMakeLists.txt, but this is only included
if(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))

moving it out of the if() block allows the os target to depend on it
even if no plugins are built

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5b975e66a0e..e0326c5ab3db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -920,9 +920,7 @@ if(WITH_TESTS AND WITH_DMCLOCK_TESTS)
   add_subdirectory(dmclock/support/test)
 endif(WITH_TESTS AND WITH_DMCLOCK_TESTS)
 
-if(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
-  add_subdirectory(crypto/isa-l)
-endif()
+add_subdirectory(crypto)
 
 if(WITH_TESTS)
   configure_file(${CMAKE_SOURCE_DIR}/src/ceph-coverage.in
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
new file mode 100644
index 000000000000..ed8e108abd0f
--- /dev/null
+++ b/src/crypto/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_custom_target(crypto_plugins)
+
+if(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
+  add_subdirectory(isa-l)
+endif()
diff --git a/src/crypto/isa-l/CMakeLists.txt b/src/crypto/isa-l/CMakeLists.txt
index 51b36989132e..662dbdeba725 100644
--- a/src/crypto/isa-l/CMakeLists.txt
+++ b/src/crypto/isa-l/CMakeLists.txt
@@ -26,7 +26,6 @@ add_library(isal_crypto_plugin_objs OBJECT ${isal_crypto_plugin_srcs})
 target_include_directories(isal_crypto_plugin_objs PRIVATE ${isal_dir}/include)
 set(isal_crypto_plugin_dir ${CMAKE_INSTALL_PKGLIBDIR}/crypto)
 
-add_custom_target(crypto_plugins)
 if(HAVE_GOOD_YASM_ELF64)
 add_dependencies(crypto_plugins ceph_crypto_isal)
 endif(HAVE_GOOD_YASM_ELF64)