svn commit: r1920686 - /apr/apr/trunk/CMakeLists.txt

Author: ivan
Date: Sun Sep 15 15:00:06 2024
New Revision: 1920686

URL: http://svn.apache.org/viewvc?rev=1920686&view=rev
Log:
CMake: Use CMake imported targets for OpenSSL and SQLite3. Similar to r1920657
and r1920658 in APR-Util.

Modified:
    apr/apr/trunk/CMakeLists.txt

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1920686&r1=1920685&r2=1920686&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Sun Sep 15 15:00:06 2024
@@ -417,7 +417,6 @@ SET(APR_SOURCES
 # Sources and libraries for APR builtin drivers. Used when APR_MODULAR_DSO=OFF.
 SET(APR_EXTRA_SOURCES)
 SET(APR_EXTRA_LIBRARIES)
-SET(APR_EXTRA_INCLUDE_DIRECTORIES)
 
 SET(APR_TEST_SUITES
   testargs
@@ -510,8 +509,7 @@ IF(NOT APR_MODULAR_DSO AND APU_HAVE_CRYP
   ENDIF()
 
   LIST(APPEND APR_EXTRA_SOURCES crypto/apr_crypto_openssl.c)
-  LIST(APPEND APR_EXTRA_LIBRARIES ${OPENSSL_LIBRARIES})
-  LIST(APPEND APR_EXTRA_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
+  LIST(APPEND APR_EXTRA_LIBRARIES OpenSSL::Crypto)
 ENDIF()
 
 IF(NOT APR_MODULAR_DSO AND APU_HAVE_ODBC)
@@ -525,8 +523,7 @@ IF(NOT APR_MODULAR_DSO AND APU_HAVE_SQLI
   LIST(APPEND dbd_drivers sqlite3)
 
   LIST(APPEND APR_EXTRA_SOURCES dbd/apr_dbd_sqlite3.c)
-  LIST(APPEND APR_EXTRA_LIBRARIES ${SQLite3_LIBRARIES})
-  LIST(APPEND APR_EXTRA_INCLUDE_DIRECTORIES "${SQLite3_INCLUDE_DIRS}")
+  LIST(APPEND APR_EXTRA_LIBRARIES SQLite::SQLite3)
 ENDIF()
 
 IF (BUILD_SHARED_LIBS)
@@ -539,7 +536,7 @@ IF (BUILD_SHARED_LIBS)
                              PRIVATE "APR_DECLARE_EXPORT"
                              INTERFACE "APR_DECLARE_IMPORT")
   TARGET_INCLUDE_DIRECTORIES(${apr_libname}
-    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR} ${XLATE_INCLUDE_DIR} ${APR_EXTRA_INCLUDE_DIRECTORIES}
+    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR} ${XLATE_INCLUDE_DIR}
     INTERFACE $<INSTALL_INTERFACE:${APR_INSTALL_INCLUDE_DIR}> ${APR_INCLUDE_DIRECTORIES}
   )
   ADD_DEPENDENCIES(${apr_libname} test_char_header)
@@ -553,7 +550,7 @@ ELSE()
                              PRIVATE "APR_DECLARE_STATIC"
                              INTERFACE "APR_DECLARE_STATIC")
   TARGET_INCLUDE_DIRECTORIES(${apr_libname}
-    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR} ${XLATE_INCLUDE_DIR} ${APR_EXTRA_INCLUDE_DIRECTORIES}
+    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR} ${XLATE_INCLUDE_DIR}
     INTERFACE $<INSTALL_INTERFACE:${APR_INSTALL_INCLUDE_DIR}> ${APR_INCLUDE_DIRECTORIES}
   )
   ADD_DEPENDENCIES(${apr_libname} test_char_header)
@@ -582,8 +579,7 @@ IF(APR_MODULAR_DSO AND APU_HAVE_CRYPTO)
   ADD_LIBRARY(apr_crypto_openssl-2 SHARED crypto/apr_crypto_openssl.c libapr.rc)
   LIST(APPEND install_modules apr_crypto_openssl-2)
   LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_crypto_openssl-2>)
-  TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${OPENSSL_LIBRARIES})
-  SET_TARGET_PROPERTIES(apr_crypto_openssl-2 PROPERTIES INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
+  TARGET_LINK_LIBRARIES(apr_crypto_openssl-2 ${apr_libname} ${APR_SYSTEM_LIBS} OpenSSL::Crypto)
   TARGET_COMPILE_DEFINITIONS(apr_crypto_openssl-2
                              PRIVATE "DLL_NAME=apr_crypto_openssl")
 ENDIF()
@@ -603,8 +599,7 @@ IF(APR_MODULAR_DSO AND APU_HAVE_SQLITE3)
   LIST(APPEND install_modules apr_dbd_sqlite3-2)
   LIST(APPEND install_bin_pdb $<TARGET_PDB_FILE:apr_dbd_sqlite3-2>)
   LIST(APPEND dbd_drivers sqlite3)
-  TARGET_LINK_LIBRARIES(apr_dbd_sqlite3-2 ${apr_libname} ${APR_SYSTEM_LIBS} ${SQLite3_LIBRARIES})
-  SET_TARGET_PROPERTIES(apr_dbd_sqlite3-2 PROPERTIES INCLUDE_DIRECTORIES "${SQLite3_INCLUDE_DIRS}")
+  TARGET_LINK_LIBRARIES(apr_dbd_sqlite3-2 ${apr_libname} ${APR_SYSTEM_LIBS} SQLite::SQLite3)
   TARGET_COMPILE_DEFINITIONS(apr_dbd_sqlite3-2
                              PRIVATE "DLL_NAME=apr_dbd_sqlite3")
 ENDIF()