From 0ae68f044f4a7097fb84cd12e6ed373e73a05d96 Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Mon, 23 Sep 2024 08:35:56 +0000 Subject: [PATCH] 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 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7ca59cc3e..31b453f064 100644 --- a/CMakeLists.txt +++ b/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 $ ${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 $ ${APR_INCLUDE_DIRECTORIES} ) ADD_DEPENDENCIES(${apr_libname} test_char_header)