diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-07-07 09:43:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 09:43:56 -0400 |
| commit | 92ffdd2cd243a49fafb317ea3a819dbe8a6dd3c9 (patch) | |
| tree | 2c31b3f31efe4fbfc726d51577a2278f591ab047 | |
| parent | 50a1f6374fd487ae6c9359c8807826efe7782372 (diff) | |
| parent | 636a2752180180132270d23a84ece7114ea331c6 (diff) | |
| download | libgit2-92ffdd2cd243a49fafb317ea3a819dbe8a6dd3c9.tar.gz | |
Merge pull request #6333 from jpalus/pcre2-detection
cmake: drop posix dependency from pcre* detection
| -rw-r--r-- | cmake/FindPCRE.cmake | 7 | ||||
| -rw-r--r-- | cmake/FindPCRE2.cmake | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake index 3a7cfad91..02e7edce1 100644 --- a/cmake/FindPCRE.cmake +++ b/cmake/FindPCRE.cmake @@ -16,19 +16,18 @@ # PCRE_FOUND - True if pcre found. # Look for the header file. -find_path(PCRE_INCLUDE_DIR NAMES pcreposix.h) +find_path(PCRE_INCLUDE_DIR NAMES pcre.h) # Look for the library. find_library(PCRE_LIBRARY NAMES pcre) -find_library(PCRE_POSIX_LIBRARY NAMES pcreposix) # Handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if all listed variables are TRUE. include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_POSIX_LIBRARY PCRE_INCLUDE_DIR) +find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR) # Copy the results to the output variables. if(PCRE_FOUND) - set(PCRE_LIBRARIES ${PCRE_LIBRARY} ${PCRE_POSIX_LIBRARY}) + set(PCRE_LIBRARIES ${PCRE_LIBRARY}) set(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) else(PCRE_FOUND) set(PCRE_LIBRARIES) diff --git a/cmake/FindPCRE2.cmake b/cmake/FindPCRE2.cmake index d4b8e6761..41c165b65 100644 --- a/cmake/FindPCRE2.cmake +++ b/cmake/FindPCRE2.cmake @@ -16,7 +16,7 @@ # PCRE2_FOUND - True if pcre found. # Look for the header file. -find_path(PCRE2_INCLUDE_DIR NAMES pcre2posix.h) +find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h) # Look for the library. find_library(PCRE2_LIBRARY NAMES pcre2-8) |