diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-05-06 15:49:37 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-05-06 14:29:20 +0000 |
| commit | 9ffcc761887f0088ae6226098723818843f0d287 (patch) | |
| tree | 1d354c3619d8684805f584cf476243161da83b90 | |
| parent | aba911c4d08be77d7458291fd3f5b53354e82944 (diff) | |
CMake: Scripts: Fix double entries in 3rd party library mapping
Change-Id: I35f29876874d6083d19382800d194e417d57bca1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/gui/configure.cmake | 4 | ||||
| -rw-r--r-- | util/cmake/helper.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 19f97628c5..476b77d8d1 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -53,8 +53,8 @@ qt_find_package(XCB COMPONENTS SYNC PROVIDED_TARGETS XCB::SYNC) qt_find_package(XCB COMPONENTS XFIXES PROVIDED_TARGETS XCB::XFIXES) qt_find_package(XCB COMPONENTS XINERAMA PROVIDED_TARGETS XCB::XINERAMA) qt_find_package(XCB COMPONENTS XKB PROVIDED_TARGETS XCB::XKB) -qt_find_package(XCB PROVIDED_TARGETS XCB::RENDER) -qt_find_package(XCB PROVIDED_TARGETS XCB::GLX) +qt_find_package(XCB COMPONENTS RENDER PROVIDED_TARGETS XCB::RENDER) +qt_find_package(XCB COMPONENTS GLX PROVIDED_TARGETS XCB::GLX) qt_find_package(XCB COMPONENTS XINPUT PROVIDED_TARGETS XCB::XINPUT) qt_find_package(XKB 0.4.1 PROVIDED_TARGETS XKB::XKB) qt_find_package(XRender PROVIDED_TARGETS PkgConfig::xrender) diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 0a78230703..d47c65ffa6 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -219,8 +219,6 @@ _library_map = [ LibraryMapping('vulkan', 'Vulkan', 'Vulkan::Vulkan'), LibraryMapping('wayland_server', 'Wayland', 'Wayland::Server'), LibraryMapping('x11sm', 'X11', '${X11_SM_LIB} ${X11_ICE_LIB}', resultVariable="X11_SM"), - LibraryMapping('xcb_glx', 'XCB', 'XCB::GLX', resultVariable='XCB_GLX'), - LibraryMapping('xcb_render', 'XCB', 'XCB::RENDER', resultVariable='XCB_RENDER'), LibraryMapping('xcb', 'XCB', 'XCB::XCB', extra = ['1.9']), LibraryMapping('xcb_glx', 'XCB', 'XCB::GLX', extra = ['COMPONENTS', 'GLX'], resultVariable='XCB_GLX'), LibraryMapping('xcb_icccm', 'XCB', 'XCB::ICCCM', extra = ['COMPONENTS', 'ICCCM'], resultVariable='XCB_ICCCM'), |