diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-03-26 13:01:36 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-13 09:40:09 +0200 |
| commit | 33752a9bd334a53e891f141afd2357eefb1a9a36 (patch) | |
| tree | adf44eafe1d4201b49088d3d8592c0b83877101a /src/3rdparty/pcre2 | |
| parent | ce1d4d362881b54ff774b49f54ef686f9aa97c73 (diff) | |
Include QRegularExpression in the bootstrap library
This allows us to use regular expressions in bootstrapped tools
such as moc and tracegen.
Change-Id: I4310dd15bf26651aac6ab30c884e025ca06b3099
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty/pcre2')
| -rw-r--r-- | src/3rdparty/pcre2/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/3rdparty/pcre2/pcre2.pri | 41 | ||||
| -rw-r--r-- | src/3rdparty/pcre2/pcre2.pro | 44 |
3 files changed, 48 insertions, 47 deletions
diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index d32073dab5..b73f0bff9e 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -51,11 +51,6 @@ qt_set_symbol_visibility_hidden(BundledPcre2) ## Scopes: ##################################################################### -qt_extend_target(BundledPcre2 CONDITION WIN32 - PUBLIC_DEFINES - PCRE2_STATIC -) - qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT OR WINRT DEFINES PCRE2_DISABLE_JIT @@ -70,3 +65,8 @@ qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64" DEFINES PCRE2_DISABLE_JIT ) + +qt_extend_target(BundledPcre2 CONDITION WIN32 + PUBLIC_DEFINES + PCRE2_STATIC +) diff --git a/src/3rdparty/pcre2/pcre2.pri b/src/3rdparty/pcre2/pcre2.pri new file mode 100644 index 0000000000..fa901f783f --- /dev/null +++ b/src/3rdparty/pcre2/pcre2.pri @@ -0,0 +1,41 @@ +MODULE_INCLUDEPATH += $$PWD/src + +MODULE_DEFINES += PCRE2_CODE_UNIT_WIDTH=16 +win32: MODULE_DEFINES += PCRE2_STATIC + +DEFINES += HAVE_CONFIG_H + +SOURCES += \ + $$PWD/src/pcre2_auto_possess.c \ + $$PWD/src/pcre2_chartables.c \ + $$PWD/src/pcre2_compile.c \ + $$PWD/src/pcre2_config.c \ + $$PWD/src/pcre2_context.c \ + $$PWD/src/pcre2_dfa_match.c \ + $$PWD/src/pcre2_error.c \ + $$PWD/src/pcre2_extuni.c \ + $$PWD/src/pcre2_find_bracket.c \ + $$PWD/src/pcre2_jit_compile.c \ + $$PWD/src/pcre2_maketables.c \ + $$PWD/src/pcre2_match.c \ + $$PWD/src/pcre2_match_data.c \ + $$PWD/src/pcre2_newline.c \ + $$PWD/src/pcre2_ord2utf.c \ + $$PWD/src/pcre2_pattern_info.c \ + $$PWD/src/pcre2_script_run.c \ + $$PWD/src/pcre2_serialize.c \ + $$PWD/src/pcre2_string_utils.c \ + $$PWD/src/pcre2_study.c \ + $$PWD/src/pcre2_substitute.c \ + $$PWD/src/pcre2_substring.c \ + $$PWD/src/pcre2_tables.c \ + $$PWD/src/pcre2_ucd.c \ + $$PWD/src/pcre2_valid_utf.c \ + $$PWD/src/pcre2_xclass.c + +HEADERS += \ + $$PWD/src/config.h \ + $$PWD/src/pcre2.h \ + $$PWD/src/pcre2_internal.h \ + $$PWD/src/pcre2_intmodedep.h \ + $$PWD/src/pcre2_ucp.h diff --git a/src/3rdparty/pcre2/pcre2.pro b/src/3rdparty/pcre2/pcre2.pro index 56790f34c5..a3915fa2fa 100644 --- a/src/3rdparty/pcre2/pcre2.pro +++ b/src/3rdparty/pcre2/pcre2.pro @@ -5,51 +5,11 @@ CONFIG += \ hide_symbols \ exceptions_off rtti_off warn_off - -MODULE_DEFINES += PCRE2_CODE_UNIT_WIDTH=16 -win32: MODULE_DEFINES += PCRE2_STATIC -MODULE_INCLUDEPATH += $$PWD/src - -load(qt_helper_lib) - -DEFINES += HAVE_CONFIG_H +include(pcre2.pri) # platform/compiler specific definitions uikit|qnx|winrt: DEFINES += PCRE2_DISABLE_JIT win32:contains(QT_ARCH, "arm"): DEFINES += PCRE2_DISABLE_JIT win32:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT -SOURCES += \ - $$PWD/src/pcre2_auto_possess.c \ - $$PWD/src/pcre2_chartables.c \ - $$PWD/src/pcre2_compile.c \ - $$PWD/src/pcre2_config.c \ - $$PWD/src/pcre2_context.c \ - $$PWD/src/pcre2_dfa_match.c \ - $$PWD/src/pcre2_error.c \ - $$PWD/src/pcre2_extuni.c \ - $$PWD/src/pcre2_find_bracket.c \ - $$PWD/src/pcre2_jit_compile.c \ - $$PWD/src/pcre2_maketables.c \ - $$PWD/src/pcre2_match.c \ - $$PWD/src/pcre2_match_data.c \ - $$PWD/src/pcre2_newline.c \ - $$PWD/src/pcre2_ord2utf.c \ - $$PWD/src/pcre2_pattern_info.c \ - $$PWD/src/pcre2_script_run.c \ - $$PWD/src/pcre2_serialize.c \ - $$PWD/src/pcre2_string_utils.c \ - $$PWD/src/pcre2_study.c \ - $$PWD/src/pcre2_substitute.c \ - $$PWD/src/pcre2_substring.c \ - $$PWD/src/pcre2_tables.c \ - $$PWD/src/pcre2_ucd.c \ - $$PWD/src/pcre2_valid_utf.c \ - $$PWD/src/pcre2_xclass.c - -HEADERS += \ - $$PWD/src/config.h \ - $$PWD/src/pcre2.h \ - $$PWD/src/pcre2_internal.h \ - $$PWD/src/pcre2_intmodedep.h \ - $$PWD/src/pcre2_ucp.h +load(qt_helper_lib) |