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

Author: ivan
Date: Mon Sep 23 08:35:56 2024
New Revision: 1920850

URL: http://svn.apache.org/viewvc?rev=1920850&view=rev
Log:
CMake: Use imported targets for XML libraries (expat, LibXml2, XmlLite)

Modified:
    apr/apr/trunk/CMakeLists.txt

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1920850&r1=1920849&r2=1920850&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Mon Sep 23 08:35:56 2024
@@ -81,7 +81,7 @@ IF(APU_HAVE_CRYPTO)
 ENDIF()
 
 IF(APU_USE_EXPAT)
-  FIND_PACKAGE(EXPAT REQUIRED)
+  FIND_PACKAGE(expat CONFIG REQUIRED)
 ENDIF()
 
 IF(APU_USE_LIBXML2)
@@ -155,13 +155,10 @@ ADD_CUSTOM_TARGET(
 )
 
 IF(APU_USE_EXPAT)
-  SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
-  SET(XMLLIB_LIBRARIES   ${EXPAT_LIBRARIES})
+  SET(XMLLIB_LIBRARIES   expat::expat)
 ELSEIF(APU_USE_LIBXML2)
-  SET(XMLLIB_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
-  SET(XMLLIB_LIBRARIES   ${LIBXML2_LIBRARIES})
+  SET(XMLLIB_LIBRARIES   LibXml2::LibXml2)
 ELSEIF(APU_USE_XMLLITE)
-  SET(XMLLIB_INCLUDE_DIR "")
   SET(XMLLIB_LIBRARIES   "xmllite.lib")
 ENDIF()
 
@@ -567,7 +564,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}
+    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XLATE_INCLUDE_DIR}
     INTERFACE $<INSTALL_INTERFACE:${APR_INSTALL_INCLUDE_DIR}> ${APR_INCLUDE_DIRECTORIES}
   )
   ADD_DEPENDENCIES(${apr_libname} test_char_header)
@@ -581,7 +578,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}
+    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XLATE_INCLUDE_DIR}
     INTERFACE $<INSTALL_INTERFACE:${APR_INSTALL_INCLUDE_DIR}> ${APR_INCLUDE_DIRECTORIES}
   )
   ADD_DEPENDENCIES(${apr_libname} test_char_header)