diff options
author | Cristian Adam <cristian.adam@qt.io> | 2019-06-05 10:48:56 +0200 |
---|---|---|
committer | Cristian Adam <cristian.adam@qt.io> | 2019-06-05 09:42:55 +0000 |
commit | 527f3bb31ce066749741bd84145270336e4bbc7a (patch) | |
tree | acb6eaaac30f9d390fd2543fa3dc783e39c503a1 /src | |
parent | eda342111156e828caa1f900b5b55d575881ac22 (diff) |
CMake: Add WrapPCRE2 package
The WrapPCRE2 package handles the PCRE2 packages that have targets,
and reuse them.
Change-Id: I24b0b51f507703cd8287f845f7e425f62dd2c3d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/corelib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/corelib/configure.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index cad230bd87..ee4143ce96 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -641,7 +641,7 @@ extend_target(Core CONDITION QT_FEATURE_regularexpression SOURCES tools/qregularexpression.cpp tools/qregularexpression.h LIBRARIES - PCRE2 + WrapPCRE2::WrapPCRE2 ) extend_target(Core CONDITION QT_FEATURE_commandlineparser diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index a032a9117e..66c211d292 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -710,7 +710,7 @@ extend_target(Core CONDITION QT_FEATURE_regularexpression SOURCES tools/qregularexpression.cpp tools/qregularexpression.h LIBRARIES - PCRE2 + WrapPCRE2::WrapPCRE2 ) extend_target(Core CONDITION QT_FEATURE_commandlineparser diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index a144d6dd8f..1a34662fbb 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -16,8 +16,8 @@ qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd) qt_find_package(Atomic PROVIDED_TARGETS Atomic) qt_find_package(WrapRt PROVIDED_TARGETS WrapRt) qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST) -qt_find_package(PCRE2 PROVIDED_TARGETS PCRE2) -set_package_properties(PCRE2 PROPERTIES TYPE REQUIRED) +qt_find_package(WrapPCRE2 PROVIDED_TARGETS WrapPCRE2::WrapPCRE2) +set_package_properties(WrapPCRE2 PROPERTIES TYPE REQUIRED) if((QNX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(PPS PROVIDED_TARGETS PPS::PPS) endif() |