]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* CMakeLists.txt: By default use PCRE2 CMake package if supported.
authorIvan Zhakov <ivan@apache.org>
Sat, 20 Jul 2024 12:51:16 +0000 (12:51 +0000)
committerIvan Zhakov <ivan@apache.org>
Sat, 20 Jul 2024 12:51:16 +0000 (12:51 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919395 13f79535-47bb-0310-9956-ffa450edef68

CMakeLists.txt

index 4ff89d049f718a043aab8c953bde6c3365e150d4..91260d62c7034caa91fdab5b2d6ec72fb84f7f5d 100644 (file)
@@ -29,6 +29,7 @@ FIND_PACKAGE(Lua51)
 FIND_PACKAGE(OpenSSL)
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(CURL)
+FIND_PACKAGE(PCRE2 COMPONENTS 8BIT)
 
 # Options for support libraries not supported by cmake-bundled FindFOO
 
@@ -49,7 +50,10 @@ ENDIF()
 # PCRE names its libraries differently for debug vs. release builds.
 # We can't query our own CMAKE_BUILD_TYPE at configure time.
 # If the debug version exists in PREFIX/lib, default to that one.
-IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/pcre2-8d.lib")
+IF(PCRE2_FOUND)
+  SET(default_pcre_libraries "PCRE2::8BIT")
+  SET(default_pcre_cflags "-DHAVE_PCRE2")
+ELSEIF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/pcre2-8d.lib")
   SET(default_pcre_libraries ${CMAKE_INSTALL_PREFIX}/lib/pcre2-8d.lib)
   SET(default_pcre_cflags "-DHAVE_PCRE2")
 ELSEIF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/pcre2-8.lib")