diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake index 5dbd8182e..f2a41b593 100644 --- a/cmake/SelectRegex.cmake +++ b/cmake/SelectRegex.cmake @@ -55,7 +55,6 @@ elseif(USE_REGEX STREQUAL "regcomp") elseif(USE_REGEX STREQUAL "builtin") add_feature_info("Regular expressions" ON "using bundled implementation") set(GIT_REGEX_BUILTIN 1) - add_definitions(-DPCRE2_STATIC) add_subdirectory("${PROJECT_SOURCE_DIR}/deps/pcre2" "${PROJECT_BINARY_DIR}/deps/pcre2") list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/pcre2") diff --git a/deps/pcre2/CMakeLists.txt b/deps/pcre2/CMakeLists.txt index 90fe0dbd8..0523d8a63 100644 --- a/deps/pcre2/CMakeLists.txt +++ b/deps/pcre2/CMakeLists.txt @@ -113,3 +113,4 @@ include_directories(${PROJECT_BINARY_DIR}) add_library(pcre2 OBJECT ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES}) +target_compile_definitions(pcre2 PRIVATE PCRE2_STATIC) diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 090cd8bf9..10cc28579 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -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 SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES}) + +if(USE_REGEX STREQUAL "builtin") + target_compile_definitions(util PRIVATE PCRE2_STATIC) +endif()