diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-05-18 19:37:59 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2019-05-19 11:12:13 +0100 |
| commit | 622166c446f25db02b31ce6059fae96cf0b6eeb2 (patch) | |
| tree | 3c76df27e8ecbaa2dd903592b02cbfe0ed8d4fd7 | |
| parent | c6e48fef4382ed9fc8113733fb6e2b960506728d (diff) | |
| download | libgit2-622166c446f25db02b31ce6059fae96cf0b6eeb2.tar.gz | |
regex: disambiguate builtin vs system pcre
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/features.h.in | 1 | ||||
| -rw-r--r-- | src/posix_regex.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 637949512..79d7b55f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -314,7 +314,7 @@ ELSEIF(REGEX STREQUAL "regcomp") SET(GIT_REGEX_REGCOMP 1) ELSEIF(REGEX STREQUAL "builtin") ADD_FEATURE_INFO(regex ON "using bundled PCRE") - SET(GIT_REGEX_PCRE 1) + SET(GIT_REGEX_BUILTIN 1) ADD_SUBDIRECTORY("${libgit2_SOURCE_DIR}/deps/pcre" "${libgit2_BINARY_DIR}/deps/pcre") LIST(APPEND LIBGIT2_INCLUDES "${libgit2_SOURCE_DIR}/deps/pcre") diff --git a/src/features.h.in b/src/features.h.in index fdc75945d..5468ceeb0 100644 --- a/src/features.h.in +++ b/src/features.h.in @@ -19,6 +19,7 @@ #cmakedefine GIT_REGEX_REGCOMP_L #cmakedefine GIT_REGEX_REGCOMP #cmakedefine GIT_REGEX_PCRE +#cmakedefine GIT_REGEX_BUILTIN 1 #cmakedefine GIT_SSH 1 #cmakedefine GIT_SSH_MEMORY_CREDENTIALS 1 diff --git a/src/posix_regex.h b/src/posix_regex.h index 5d0342e74..a0482c915 100644 --- a/src/posix_regex.h +++ b/src/posix_regex.h @@ -15,7 +15,7 @@ * compatible implementation. */ -#ifdef GIT_REGEX_PCRE +#ifdef GIT_REGEX_BUILTIN # include "pcreposix.h" |