cmake: Add missing ssl include

A few modules are using ssl headers without having the openssl
include dir set by the cmake files.

This change updates the according cmake files.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>

diff --git a/src/auth/CMakeLists.txt b/src/auth/CMakeLists.txt
index b6ae0c83efdc0bb9669ce2416ff583134ea80fe7..8e849373a0b6e80dcf530f252c110ea9caf50db2 100644 (file)
--- a/src/auth/CMakeLists.txt
+++ b/src/auth/CMakeLists.txt
@@ -21,3 +21,4 @@ if(HAVE_GSSAPI)
 endif()
 
 add_library(common-auth-objs OBJECT ${auth_srcs})
+target_include_directories(common-auth-objs PRIVATE ${OPENSSL_INCLUDE_DIR})

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 7affa6d5f6b886383c339f806d2a9b9f3f3ee7ab..5e7fb6a78ebe8aa03d8f14a7c82d7e1dfa010b9d 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -126,6 +126,10 @@ endif()
 
 add_library(common-common-objs OBJECT
   ${common_srcs})
+# Let's not rely on the default system headers and point Cmake to the
+# retrieved OpenSSL location. This is especially important when cross
+# compiling (e.g. targeting Windows).
+target_include_directories(common-common-objs PRIVATE ${OPENSSL_INCLUDE_DIR})
 # for options.cc
 target_compile_definitions(common-common-objs PRIVATE
   "CEPH_LIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\""

diff --git a/src/crypto/openssl/CMakeLists.txt b/src/crypto/openssl/CMakeLists.txt
index 2525ed9359baf03880ff86d93ad008f7cd17e812..7a63a32e8b3b6c0c9a3bc851642c0067fb5a8253 100644 (file)
--- a/src/crypto/openssl/CMakeLists.txt
+++ b/src/crypto/openssl/CMakeLists.txt
@@ -6,6 +6,7 @@ set(openssl_crypto_plugin_srcs
 
 add_library(ceph_crypto_openssl SHARED ${openssl_crypto_plugin_srcs})
 target_link_libraries(ceph_crypto_openssl PRIVATE crypto)
+target_include_directories(ceph_crypto_openssl PRIVATE ${OPENSSL_INCLUDE_DIR})
 add_dependencies(crypto_plugins ceph_crypto_openssl)
 set_target_properties(ceph_crypto_openssl PROPERTIES INSTALL_RPATH "")
 install(TARGETS ceph_crypto_openssl DESTINATION ${crypto_plugin_dir})

diff --git a/src/msg/CMakeLists.txt b/src/msg/CMakeLists.txt
index ce6550a57f6b13656cdc1118ce7aaad1da64ff3c..0c8359657958497ba8b88362e06788242406a25a 100644 (file)
--- a/src/msg/CMakeLists.txt
+++ b/src/msg/CMakeLists.txt
@@ -38,6 +38,7 @@ if(HAVE_RDMA)
 endif()
 
 add_library(common-msg-objs OBJECT ${msg_srcs})
+target_include_directories(common-msg-objs PRIVATE ${OPENSSL_INCLUDE_DIR})
 
 if(WITH_DPDK)
   set(async_dpdk_srcs