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

Scope PCRE2_STATIC to pcre2 and util targets

Browse Source
This commit is contained in:
copilot-swe-agent[bot]
2026-05-31 09:32:41 +00:00
committed by GitHub
parent a66091959f
commit a8e842edd1
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/SelectRegex.cmake
View File

@@ -55,7 +55,6 @@ elseif(USE_REGEX STREQUAL "regcomp")
elseif(USE_REGEX STREQUAL "builtin") elseif(USE_REGEX STREQUAL "builtin")
add_feature_info("Regular expressions" ON "using bundled implementation") add_feature_info("Regular expressions" ON "using bundled implementation")
set(GIT_REGEX_BUILTIN 1) set(GIT_REGEX_BUILTIN 1)
add_definitions(-DPCRE2_STATIC)
add_subdirectory("${PROJECT_SOURCE_DIR}/deps/pcre2" "${PROJECT_BINARY_DIR}/deps/pcre2") add_subdirectory("${PROJECT_SOURCE_DIR}/deps/pcre2" "${PROJECT_BINARY_DIR}/deps/pcre2")
list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/pcre2") list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/pcre2")

1
deps/pcre2/CMakeLists.txt vendored
View File

@@ -113,3 +113,4 @@ include_directories(${PROJECT_BINARY_DIR})
add_library(pcre2 OBJECT add_library(pcre2 OBJECT
${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PCRE2_HEADERS} ${PCRE2_SOURCES}
${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES}) ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES})
target_compile_definitions(pcre2 PRIVATE PCRE2_STATIC)

4
src/util/CMakeLists.txt
View File

@@ -78,3 +78,7 @@ ide_split_sources(util)
target_include_directories(util PRIVATE ${UTIL_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${libgit2_SOURCE_DIR}/include) target_include_directories(util PRIVATE ${UTIL_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${libgit2_SOURCE_DIR}/include)
target_include_directories(util SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES}) target_include_directories(util SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
if(USE_REGEX STREQUAL "builtin")
target_compile_definitions(util PRIVATE PCRE2_STATIC)
endif()