You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by iv...@apache.org on 2024/09/14 18:06:09 UTC

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

Author: ivan
Date: Sat Sep 14 18:06:09 2024
New Revision: 1920647

URL: http://svn.apache.org/viewvc?rev=1920647&view=rev
Log:
CMake: Search for expat package in Config mode. Config mode package named
lowercase (expat) instead of uppercase (EXPAT).

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=1920647&r1=1920646&r2=1920647&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Sat Sep 14 18:06:09 2024
@@ -30,7 +30,7 @@ IF(POLICY CMP0091)
 ENDIF()
 
 FIND_PACKAGE(APR REQUIRED)
-FIND_PACKAGE(EXPAT)
+FIND_PACKAGE(expat CONFIG)
 FIND_PACKAGE(LibXml2)
 FIND_PACKAGE(OpenSSL)
 FIND_PACKAGE(SQLite3)
@@ -106,8 +106,8 @@ CONFIGURE_FILE(include/apu_want.hw
                COPYONLY)
 
 IF(APU_USE_EXPAT)
-  SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
-  SET(XMLLIB_LIBRARIES   ${EXPAT_LIBRARIES})
+  SET(XMLLIB_INCLUDE_DIR)
+  SET(XMLLIB_LIBRARIES   expat::expat)
 ELSE()
   SET(XMLLIB_INCLUDE_DIR)
   SET(XMLLIB_LIBRARIES   LibXml2::LibXml2)