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 /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 'configure.cmake')
| -rw-r--r-- | configure.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 934327a1f0..3c86c89f95 100644 --- a/configure.cmake +++ b/configure.cmake @@ -8,6 +8,7 @@ qt_find_package(ZLIB PROVIDED_TARGETS ZLIB::ZLIB) qt_find_package(ZSTD PROVIDED_TARGETS ZSTD::ZSTD) +qt_find_package(DBus1 PROVIDED_TARGETS dbus-1) qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev) @@ -414,7 +415,7 @@ qt_feature("dbus" PUBLIC PRIVATE qt_feature_definition("dbus" "QT_NO_DBUS" NEGATE VALUE "1") qt_feature("dbus_linked" PRIVATE LABEL "Qt D-Bus directly linked to libdbus" - CONDITION QT_FEATURE_dbus AND libs.dbus OR FIXME + CONDITION QT_FEATURE_dbus AND DBus1_FOUND ENABLE INPUT_dbus STREQUAL 'linked' DISABLE INPUT_dbus STREQUAL 'runtime' ) |