AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Scripts: Fix double entries in 3rd party library mapping

Browse Source 
Change-Id: I35f29876874d6083d19382800d194e417d57bca1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tobias Hunger 2019-05-06 15:49:37 +02:00
parent aba911c4d0
commit 9ffcc76188
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/configure.cmake
View File

@ -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)

2
util/cmake/helper.py
View File

@ -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'),