diff options
| author | Jean-Michaël Celerier <jeanmichael.celerier@gmail.com> | 2019-06-05 10:08:44 +0200 |
|---|---|---|
| committer | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2019-06-05 08:53:34 +0000 |
| commit | fecd9d90daa22b33c40a709da21cef62bfa44a15 (patch) | |
| tree | 864943309ab14b3c4422cd3195ab25857d01742b /src/plugins/platforms/xcb/CMakeLists.txt | |
| parent | c220974ed8c6c972d43f535afa7b1bbcb1ccc5e2 (diff) | |
Fix static usage requirements for XcbQpa
In particular, Qt targets extended with other qt targets
(eg. Qt::VulkanSupport or Qt::LinuxAccessibilitySupport)
after the first add_qt_module were not taken into account when generating
Depends files.
Note that this patch updates the minimum required version
to CMake 3.15
Change-Id: I747deedd4d59e385876bc1a834ef9bdb6078911b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/CMakeLists.txt')
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 2d5dbbef1d..9f94791550 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -1,16 +1,25 @@ # Generated from xcb.pro. # begin special case: -qt_find_package(X11_XCB) -qt_find_package(X11) +qt_find_package(X11_XCB + PROVIDED_TARGETS + X11::XCB +) +qt_find_package(X11 + PROVIDED_TARGETS + X11::X11 +) qt_find_package(XCB) qt_find_package(XKB) qt_find_package(PkgConfig) qt_find_package(WrapFreetype) -qt_find_package(GLIB2) +qt_find_package(GLIB2 + PROVIDED_TARGETS + GLIB2::GLIB2 +) qt_find_package(XRender PROVIDED_TARGETS PkgConfig::XRender) +qt_find_package(XKB_COMMON_X11 PROVIDED_TARGETS PkgConfig::XKB_COMMON_X11) -pkg_check_modules(XKB_COMMON_X11 xkbcommon-x11>=0.4.1 IMPORTED_TARGET) # special case # end special case: ##################################################################### |