[CMake] Use CMake imported target for OpenSSL

xrootd · Mar 15, 2023 · 9724a81 · 9724a81
1 parent ab669ae
commit 9724a81
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 21 deletions.
diff --git a/src/XrdCl/CMakeLists.txt b/src/XrdCl/CMakeLists.txt
@@ -113,10 +113,10 @@ target_link_libraries(
   XrdUtils
   uuid::uuid
   ZLIB::ZLIB
+  OpenSSL::SSL
   ${CMAKE_THREAD_LIBS_INIT}
   ${EXTRA_LIBS}
-  ${CMAKE_DL_LIBS}
-  ${OPENSSL_LIBRARIES})
+  ${CMAKE_DL_LIBS})
 
 set_target_properties(
   XrdCl

diff --git a/src/XrdCrypto.cmake b/src/XrdCrypto.cmake
@@ -66,7 +66,7 @@ add_library(
 target_link_libraries(
   XrdCryptoLite
   XrdUtils
-  ${OPENSSL_CRYPTO_LIBRARY} )
+  OpenSSL::Crypto )
 
 set_target_properties(
   XrdCryptoLite
@@ -79,7 +79,6 @@ set_target_properties(
 #-------------------------------------------------------------------------------
 # The XrdCryptossl module
 #-------------------------------------------------------------------------------
-include_directories( ${OPENSSL_INCLUDE_DIR} )
 
 set( XrdCryptosslSources
      XrdCrypto/XrdCryptosslAux.cc       XrdCrypto/XrdCryptosslAux.hh
@@ -103,7 +102,7 @@ target_link_libraries(
   XrdCrypto
   XrdUtils
   ${CMAKE_THREAD_LIBS_INIT}
-  ${OPENSSL_LIBRARIES} )
+  OpenSSL::SSL )
 
 set_target_properties(
   ${LIB_XRD_CRYPTOSSL}

diff --git a/src/XrdHttp.cmake b/src/XrdHttp.cmake
@@ -16,7 +16,6 @@ if( BUILD_HTTP )
   #-----------------------------------------------------------------------------
   # The XrdHttp library
   #-----------------------------------------------------------------------------
-  include_directories( ${OPENSSL_INCLUDE_DIR} )
 
   set( XrdHttpSources
     XrdHttp/XrdHttpProtocol.cc        XrdHttp/XrdHttpProtocol.hh
@@ -47,8 +46,8 @@ if( BUILD_HTTP )
     XrdCrypto
     ${CMAKE_DL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
-    ${OPENSSL_LIBRARIES}
-    ${OPENSSL_CRYPTO_LIBRARY} )
+    OpenSSL::SSL
+    OpenSSL::Crypto )
 
   target_link_libraries(
     ${MOD_XRD_HTTP}
@@ -59,16 +58,12 @@ if( BUILD_HTTP )
     ${LIB_XRD_HTTP_UTILS}
     PROPERTIES
     VERSION   ${XRD_HTTP_UTILS_VERSION}
-    SOVERSION ${XRD_HTTP_UTILS_SOVERSION}
-    INTERFACE_LINK_LIBRARIES ""
-    LINK_INTERFACE_LIBRARIES "" )
+    SOVERSION ${XRD_HTTP_UTILS_SOVERSION})
 
   set_target_properties(
     ${MOD_XRD_HTTP}
     PROPERTIES
-    INTERFACE_LINK_LIBRARIES ""
-    SUFFIX ".so"
-    LINK_INTERFACE_LIBRARIES "" )
+    SUFFIX ".so")
 
   #-----------------------------------------------------------------------------
   # Install

diff --git a/src/XrdMacaroons.cmake b/src/XrdMacaroons.cmake
@@ -10,7 +10,7 @@ set( LIB_XRD_MACAROONS  XrdMacaroons-${PLUGIN_VERSION} )
 #-------------------------------------------------------------------------------
 
 if( BUILD_MACAROONS )
-  include_directories(${MACAROONS_INCLUDES} ${JSON_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
+  include_directories(${MACAROONS_INCLUDES} ${JSON_INCLUDE_DIRS})
 
   add_library(
     ${LIB_XRD_MACAROONS}
@@ -29,7 +29,7 @@ if( BUILD_MACAROONS )
     ${MACAROONS_LIB}
     ${JSON_LIBRARIES}
     ${XROOTD_HTTP_LIB}
-    ${OPENSSL_CRYPTO_LIBRARY})
+    OpenSSL::Crypto)
 
   if( MacOSX )
     SET( MACAROONS_LINK_FLAGS "-Wl")

diff --git a/src/XrdSec.cmake b/src/XrdSec.cmake
@@ -60,7 +60,7 @@ target_link_libraries(
   ${LIB_XRD_SEC_PROT}
   XrdUtils
   ${CMAKE_THREAD_LIBS_INIT}
-  ${OPENSSL_CRYPTO_LIBRARY} )
+  OpenSSL::Crypto )
 
 set_target_properties(
   ${LIB_XRD_SEC_PROT}

diff --git a/src/XrdSecgsi.cmake b/src/XrdSecgsi.cmake
@@ -82,7 +82,7 @@ target_link_libraries(
   xrdgsiproxy
   XrdCrypto
   XrdUtils
-  ${OPENSSL_CRYPTO_LIBRARY} )
+  OpenSSL::Crypto )
 
 #-------------------------------------------------------------------------------
 # xrdgsitest
@@ -95,7 +95,7 @@ target_link_libraries(
   xrdgsitest
   XrdCrypto
   XrdUtils
-  ${OPENSSL_CRYPTO_LIBRARY} )
+  OpenSSL::Crypto )
 endif()
 
 #-------------------------------------------------------------------------------

diff --git a/src/XrdUtils.cmake b/src/XrdUtils.cmake
@@ -291,9 +291,9 @@ add_library(
 
 target_link_libraries(
   XrdUtils
+  OpenSSL::SSL
   ${CMAKE_THREAD_LIBS_INIT}
   ${CMAKE_DL_LIBS}
-  ${OPENSSL_LIBRARIES}
   ${SOCKET_LIBRARY}
   ${SENDFILE_LIBRARY}
   ${EXTRA_LIBS} )

diff --git a/tests/XrdClTests/tls/CMakeLists.txt b/tests/XrdClTests/tls/CMakeLists.txt
@@ -27,7 +27,7 @@ add_executable(
 target_link_libraries(
   xrdsrv-tls
   XrdUtils
-  ${OPENSSL_LIBRARIES}
+  OpenSSL::SSL
   ${CMAKE_THREAD_LIBS_INIT} )
 
 endif()