Author: rinrab Date: Sun Aug 4 10:24:28 2024 New Revision: 1919660 URL: http://svn.apache.org/viewvc?rev=1919660&view=rev Log: On the 'cmake' branch: Reverting the change from r1918954 to use Module for finding Expat instead of config.
There is a problem when using CONFIG mode for expat library on the OpenBSD system because the config file doesn't exist on this system. Using of module would fix it. The problem is reported and discussed in the `Building with CMake on Linux' thread on dev@; the discussion is archived and available at [1]. * CMakeLists.txt (expat finding): Remove CONFIG keyword from find_package invocation to use Module for it and adjust the name used for expat since they are different from the names used in CONFIG mode. Found by: Stefan Sperling Suggested by: Daniel Sahlberg [1] https://lists.apache.org/thread/1mpqrt98owsxoj13rmqlo1m8r0ll9cxv Modified: subversion/branches/cmake/CMakeLists.txt Modified: subversion/branches/cmake/CMakeLists.txt URL: http://svn.apache.org/viewvc/subversion/branches/cmake/CMakeLists.txt?rev=1919660&r1=1919659&r2=1919660&view=diff ============================================================================== --- subversion/branches/cmake/CMakeLists.txt (original) +++ subversion/branches/cmake/CMakeLists.txt Sun Aug 4 10:24:28 2024 @@ -175,8 +175,8 @@ add_library(external-zlib ALIAS ZLIB::ZL ### EXPAT -find_package(expat CONFIG REQUIRED) -add_library(external-xml ALIAS expat::expat) +find_package(EXPAT REQUIRED) +add_library(external-xml ALIAS EXPAT::EXPAT) ### LZ4 @@ -517,7 +517,7 @@ message(STATUS " Install private head message(STATUS " Dependecies:") message(STATUS " APR ........................... : ${APR_VERSION}") message(STATUS " APR-Util ...................... : ${APRUTIL_VERSION}") -message(STATUS " EXPAT ......................... : ${expat_VERSION}") +message(STATUS " EXPAT ......................... : ${EXPAT_VERSION_STRING}") message(STATUS " ZLIB .......................... : ${ZLIB_VERSION}") message(STATUS " LZ4 ........................... : ${lz4_VERSION}") message(STATUS " UTF8PROC ...................... : ${UTF8PROC_VERSION}")
