svn commit: r1920645 - /apr/apr-util/branches/1.7.x/CMakeLists.txt

Author: ivan
Date: Sat Sep 14 17:50:59 2024
New Revision: 1920645

URL: http://svn.apache.org/viewvc?rev=1920645&view=rev
Log:
CMake: Use imported target for LibXml2 to automatically link with LibXml2
dependencies.

Modified:
    apr/apr-util/branches/1.7.x/CMakeLists.txt

Modified: apr/apr-util/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/CMakeLists.txt?rev=1920645&r1=1920644&r2=1920645&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Sat Sep 14 17:50:59 2024
@@ -55,10 +55,6 @@ OPTION(APU_HAVE_SQLITE3     "Build SQLit
 OPTION(APR_HAS_LDAP         "LDAP support"                              ON)
 OPTION(INSTALL_PDB          "Install .pdb files (if generated)"         ON)
 OPTION(APR_BUILD_TESTAPR    "Build the test suite"                      OFF)
-SET(LIBXML2_ICONV_INCLUDE_DIR   ""
-    CACHE STRING "Directory with iconv include files for libxml2")
-SET(LIBXML2_ICONV_LIBRARIES     ""
-    CACHE STRING "iconv libraries to link with for libxml2")
 
 SET(APU_INSTALL_BIN_DIR      "bin"                       CACHE STRING "Install subdirectory for binary files")
 SET(APU_INSTALL_LIB_DIR      "lib"                       CACHE STRING "Install subdirectory for library files")
@@ -113,8 +109,8 @@ IF(APU_USE_EXPAT)
   SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
   SET(XMLLIB_LIBRARIES   ${EXPAT_LIBRARIES})
 ELSE()
-  SET(XMLLIB_INCLUDE_DIR "${LIBXML2_INCLUDE_DIR};${LIBXML2_ICONV_INCLUDE_DIR}")
-  SET(XMLLIB_LIBRARIES   "${LIBXML2_LIBRARIES};${LIBXML2_ICONV_LIBRARIES}")
+  SET(XMLLIB_INCLUDE_DIR)
+  SET(XMLLIB_LIBRARIES   LibXml2::LibXml2)
 ENDIF()