diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-28 16:16:30 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-01 14:34:46 +0100 |
| commit | 566ba523ad556228dab515e73927d358583b86a8 (patch) | |
| tree | 81ad9892e486330100a54f6a4e08d887e0d106e5 /src/tools/bootstrap | |
| parent | 295d4d6955ff96888273fb23906ca75a10795ca2 (diff) | |
Move static PCRE2 defines to non-system PCRE2 section
Private PCRE2-specific definitions should be only used with the
built-in PCRE2 library.
Ammends 7c69eb8868b6c79c3c70f3cd7ee6ceb188b0521b
Fixes: QTBUG-90556
Change-Id: If47e0b9eaaece290676d6c2b484bb52281aa7c68
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 196731d414..a2f0e30920 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -99,8 +99,6 @@ qt_internal_extend_target(Bootstrap ../../xml/dom/qdom.cpp DEFINES HAVE_CONFIG_H - PCRE2_CODE_UNIT_WIDTH=16 - PCRE2_DISABLE_JIT PUBLIC_DEFINES # special case QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case @@ -157,8 +155,6 @@ qt_internal_extend_target(Bootstrap CONDITION WIN32 ../../corelib/kernel/qsystemsemaphore_win.cpp ../../corelib/kernel/qwinregistry.cpp ../../corelib/plugin/qsystemlibrary.cpp - PUBLIC_DEFINES - PCRE2_STATIC PUBLIC_LIBRARIES advapi32 netapi32 @@ -229,10 +225,18 @@ qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEA ../../3rdparty/pcre2/src/pcre2_xclass.c INCLUDE_DIRECTORIES ../../3rdparty/pcre2/src + DEFINES + PCRE2_CODE_UNIT_WIDTH=16 + PCRE2_DISABLE_JIT PUBLIC_INCLUDE_DIRECTORIES # special case $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/pcre2/src> ) +qt_internal_extend_target(Bootstrap + CONDITION WIN32 AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_pcre2) + PUBLIC_DEFINES PCRE2_STATIC +) + qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_pcre2 AND NOT CMAKE_CROSSCOMPILING LIBRARIES WrapPCRE2::WrapPCRE2 |