diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-05-03 15:02:32 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-05-03 13:42:25 +0000 |
commit | 7874ce780130cdecd6188662f03703ff49387ab0 (patch) | |
tree | 81fe8f5c09d7c60ae6889c537439dba17064a39c /src/corelib/configure.cmake | |
parent | 9618434de56644fb61a76d4a3eb2176d629023fc (diff) |
CMake: Improve mapping of libraries
Merge all data related to mapping libraries into one data structure
in helper.py.
Use that data for everything related to library mapping.
This change enables way more features now like e.g. adding find_package
calls into generated files.
Change-Id: Ibbd2a1063cbeb65277582d434a6a672d62fc170b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
-rw-r--r-- | src/corelib/configure.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 019cdef67e..a5b40b56a0 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -12,14 +12,14 @@ set_property(CACHE INPUT_iconv PROPERTY STRINGS undefined no yes posix sun gnu) qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2) qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data) -qt_find_package(Libsystemd) +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) +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(PPS) -qt_find_package(Slog2) +qt_find_package(PPS PROVIDED_TARGETS PPS::PPS) +qt_find_package(Slog2 PROVIDED_TARGETS Slog2::Slog2) #### Tests |