CMake: Use imported targets for XML libraries (expat, LibXml2, XmlLite)

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1920850 13f79535-47bb-0310-9956-ffa450edef68

CMakeLists.txt

@@ -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)