Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

regex: disambiguate builtin vs system pcre

Browse Source
This commit is contained in:
Edward Thomson
2019-05-18 19:37:59 +01:00
parent c6e48fef43
commit 622166c446
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -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")

1
src/features.h.in
View File

@@ -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

2
src/posix_regex.h
View File

@@ -15,7 +15,7 @@
* compatible implementation.
*/
#ifdef GIT_REGEX_PCRE
#ifdef GIT_REGEX_BUILTIN
# include "pcreposix.h"