Skip to content

G
git2
Commit 622166c4 by Edward Thomson
Options

regex: disambiguate builtin vs system pcre

parent c6e48fef
Showing with 3 additions and 2 deletions
src/CMakeLists.txt
...@@ -314,7 +314,7 @@ ELSEIF(REGEX STREQUAL "regcomp") ...@@ -314,7 +314,7 @@ ELSEIF(REGEX STREQUAL "regcomp")
SET(GIT_REGEX_REGCOMP 1) SET(GIT_REGEX_REGCOMP 1)
ELSEIF(REGEX STREQUAL "builtin") ELSEIF(REGEX STREQUAL "builtin")
ADD_FEATURE_INFO(regex ON "using bundled PCRE") 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") ADD_SUBDIRECTORY("${libgit2_SOURCE_DIR}/deps/pcre" "${libgit2_BINARY_DIR}/deps/pcre")
LIST(APPEND LIBGIT2_INCLUDES "${libgit2_SOURCE_DIR}/deps/pcre") LIST(APPEND LIBGIT2_INCLUDES "${libgit2_SOURCE_DIR}/deps/pcre")
......
src/features.h.in
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#cmakedefine GIT_REGEX_REGCOMP_L #cmakedefine GIT_REGEX_REGCOMP_L
#cmakedefine GIT_REGEX_REGCOMP #cmakedefine GIT_REGEX_REGCOMP
#cmakedefine GIT_REGEX_PCRE #cmakedefine GIT_REGEX_PCRE
#cmakedefine GIT_REGEX_BUILTIN 1
#cmakedefine GIT_SSH 1 #cmakedefine GIT_SSH 1
#cmakedefine GIT_SSH_MEMORY_CREDENTIALS 1 #cmakedefine GIT_SSH_MEMORY_CREDENTIALS 1
......
src/posix_regex.h
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* compatible implementation. * compatible implementation.
*/ */
#ifdef GIT_REGEX_PCRE #ifdef GIT_REGEX_BUILTIN
# include "pcreposix.h" # include "pcreposix.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment