diff options
| author | Patrick Steinhardt <ps@pks.im> | 2020-09-18 14:34:01 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2020-09-18 14:55:40 +0200 |
| commit | 8c3248ec8654997ae67fa15c325ae98b38c8eb99 (patch) | |
| tree | dbcf22fbb5489873b2b71ff9a329d20f27869fe1 | |
| parent | 4e28ee0b1762801b3af2a8db772ead9b9d827b64 (diff) | |
| download | libgit2-pks-cmake-targets.tar.gz | |
deps: pcre: Use per-target propertiespks-cmake-targets
Instead of setting up global properties, we should be using
target-scoped ones. This commit converts the pcre dependency to do
exactly that.
| -rw-r--r-- | deps/pcre/CMakeLists.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/deps/pcre/CMakeLists.txt b/deps/pcre/CMakeLists.txt index d7fc6080a..529a14015 100644 --- a/deps/pcre/CMakeLists.txt +++ b/deps/pcre/CMakeLists.txt @@ -119,22 +119,19 @@ SET(PCREPOSIX_SOURCES pcreposix.c) # Build setup -ADD_DEFINITIONS(-DHAVE_CONFIG_H) - -IF(MSVC) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) -ENDIF(MSVC) - SET(CMAKE_INCLUDE_CURRENT_DIR 1) SET(targets) # Libraries # pcre -INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src/pcre) -ADD_LIBRARY(pcre OBJECT ${PCRE_HEADERS} ${PCRE_SOURCES} ${PCREPOSIX_SOURCES}) - +add_library(pcre OBJECT ${PCRE_HEADERS} ${PCRE_SOURCES} ${PCREPOSIX_SOURCES}) +target_include_directories(pcre PRIVATE ${PROJECT_BINARY_DIR}/src/pcre) target_disable_warning(pcre unused-function) target_disable_warning(pcre implicit-fallthrough) +target_compile_definitions(pcre PRIVATE HAVE_CONFIG_H) +if(MSVC) + target_compile_definitions(pcre PRIVATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS) +endif() # end CMakeLists.txt |