summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/pcre2/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* PCRE2: upgrade to 10.43Giuseppe D'Angelo2024-02-191-0/+1
| | | | | | | | | | | | Apart from some source code reshuffling, 10.43's JIT has dropped its support for ARMv5. [ChangeLog][Third-Party Code] PCRE2 was updated to version 10.43. Pick-to: 6.7 6.6 6.5 Change-Id: I7909f0a9358f38282f5eaeacd2eb10529b47e63c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* src: Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-101-7/+0
| | | | | | Pick-to: 6.5 Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake: Don't use AUTOMOC for third party librariesAlexandru Croitor2022-07-251-0/+1
| | | | | | | | | | | None of them have Qt sources that need moc-ing. It's also needed to circumvent an AUTOMOC + PCH issue when AUTOMOC is enabled for a target that does not have any C++ sources, but the target links to another target that does have C++ sources. Pick-to: 6.4 Change-Id: Ib1b2aa766089f093117c1ba34e156dfe8b0957e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Granularily disable PCRE2 JIT on macOS ARMTor Arne Vestbø2021-05-191-4/+3
| | | | | | | | | | | | | | 2f8df4d1a87df9dd67913b016171dac20839d16e disabled the PCRE2 JIT on macOS for ARM, but did so based on the build system architecture configure test. When doing a universal build these configure tests are based on the primary architecture (x86_64 in our case), which means we ended up still enabling the JIT. We work around it by passing the PCRE2_DISABLE_JIT define only when building the arm64 slice. Change-Id: I60df82acb57030ccef8b117a40209eb107b1d5bd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-09-231-6/+6
| | | | | | | | | | | Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Disable PCRE2 JIT on macOS ARM64Tor Arne Vestbø2020-07-101-1/+6
| | | | | | | | | | | | It's already disabled for many other ARM platforms, and upstream support for Apple Silicon is still pending, so we disable it for now. See: https://bugs.exim.org/show_bug.cgi?id=2618 Fixes: QTBUG-85528 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I42b6e5efaa07c9b832cd05a47436eb86a214e9bf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* CMake: Fix pcre2 compilation with intelcet part 2Alexandru Croitor2020-06-251-0/+4
| | | | | | | | | | | | | I somehow forgot that we build the pcre2 sources not only as part of the bootstrap library and qmake, but also as separate library as well. Apply the flags to the bundled library. Amends 976fa5134aea52741df7b25a196fa36251dc932f Amends fa98adbd04de9d44ce921436b92589a41f285dcd Change-Id: Ia1db3a8bd731c7e3ee4d7109be8e2ef98c594070 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove winrtOliver Wolff2020-06-061-1/+1
| | | | | | | | | Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* CMake: Regenerate tools and 3rd partyAlexandru Croitor2020-05-291-0/+3
| | | | | Change-Id: I38e065cddc954e8594a5dce823c3bb5385a8a1e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Generate information about 3rdparty libs in module .pri filesJoerg Bornemann2020-05-191-0/+1
| | | | | | | | | | | | | For modules that are not yet ported to CMake and that use QMAKE_USE += libfoo we need to provide the information about libfoo in the qt_lib_XXX.pri files. Also, we now generate qt_ext_XXX.pri files for bundled 3rdparty libs. Task-number: QTBUG-75666 Change-Id: I9e4b057a197554ecb37c294c0bf09e2a2b3aa053 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Include QRegularExpression in the bootstrap libraryLars Knoll2020-04-131-5/+5
| | | | | | | | 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>
* cmake: Regenerate projectsAlexandru Croitor2020-03-161-1/+1
| | | | | Change-Id: I0cd4f34b0df0227789805f30f474ff6aa275078f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* cmake: Remove APPLE prefix from platform namesTor Arne Vestbø2020-03-161-1/+1
| | | | | | | None of the other platforms have it. Change-Id: Ib448c2c03ba03f711b507ef391977c0e6aa7c192 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Allow building bundled 3rd party libraries in qtbaseAlexandru Croitor2020-02-251-0/+72
A few things are needed to accomplish that: - the python scripts do not ignore certain system_foo features anymore (it is a hardcoded list for now just to be safe) - configurejson2cmake now outputs qt_find_package(WrapSystemFoo) calls for bundled libraries (see below) - the harfbuzz .pro file is modified to accommodate pro2cmake not being able to correctly parse some conditional scopes - the freetype .pro file is modified to make sure linking of the library succeeds without duplicate symbol errors, which qmake doesn't encounter due to magical exclusion of cpp files that are included in other cpp files (presumably for include moc_foo.cpp support) - feature evaluation for Core, Gui, Network now happens in the qtbase/src directory, so that bundled libraries can be conditionally built - for each bundled library there are now two FindWrap scripts: - FindWrapSystemFoo which finds an installed library in the system - FindWrapFoo which either uses the system installed library or the built bundled one depending on a condition - projects that intend to use bundled libraries need to link against WrapFoo::WrapFoo instead of WrapSystemFoo::WrapSystemFoo targets (this is handled by pro2cmake). Unfortunately manually added qt_find_package(WrapFoo) calls might still be needed as is the case for WrapFreetype and others. - a new cmake/QtFindWrapHelper.cmake file is added that provides a macro to simplify creation of WrapFoo targets that link against a bundled or system library. The implementation is fairly ugly due to CMake macro constraints, but it was deemed better than copy-pasting a bunch of almost identical code across all FindWrapFoo.cmake files. - a qtzlib header-only module is now created when using bundled zlib, to provide public syncqt created headers for consumers that need them. These are projects that have 'QT_PRIVATE += zlib-private' in their .pro files (e.g. qtimageformats, qtlocation, qt3d, etc.) This is unfortunately needed due to QtNetwork using zlib types in its private C++ API. The change includes support for building the following bundled libraries: - zlib - libpng - libjpeg - Freetype - Harfbuzz-ng - PCRE2 The following 3rd party libraries are still using an old implementation within the CMake build system, and should be migrated to the new one in the near future: - double-conversion - Old harfbuzz The are a few libraries that are not yet ported: - system-sqlite - systemxcb - maybe others Among other things, this change allows building qtbase on Windows without requiring vcpkg. Task-number: QTBUG-82167 Change-Id: I35ecea0d832f66c1943c82e618de4a51440971a5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 19:02:39 +0000