diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-06-04 09:19:17 +0200 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-06-04 08:45:46 +0000 |
| commit | 9e6781b69e19f66cb56b1875c583da4682909a85 (patch) | |
| tree | f3bd2e56d74378c4378af65dd44be9092f48e7c1 | |
| parent | 5715ef13d217b087b87162fef86b0abc561177aa (diff) | |
cmake: Fix xcb build
Need
qt_find_package(X11_XCB)
in src/gui/configure.cmake since we're using it in the file
qt_feature("xcb_xlib" PRIVATE
LABEL "XCB Xlib"
CONDITION QT_FEATURE_xlib AND X11_XCB_FOUND
)
Need
qt_find_package(XRender PROVIDED_TARGETS PkgConfig::xrender)
in src/plugins/platforms/xcb/CMakeLists.tx since we're using it in the
file
extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
PUBLIC_LIBRARIES
PkgConfig::xrender
)
Use capital XRender in pkgconfig to be more consistent on how XRender is
called everywhere else
Change-Id: I403ead2cc123b08f741c5142f20db88987657ba8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/FindXRender.cmake | 6 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/configure.cmake | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | util/cmake/helper.py | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/cmake/FindXRender.cmake b/cmake/FindXRender.cmake index f9b8b266c9..9f2e341208 100644 --- a/cmake/FindXRender.cmake +++ b/cmake/FindXRender.cmake @@ -1,5 +1,9 @@ include(FindPkgConfig) -if(NOT TARGET PkgConfig::xrender) +if(NOT TARGET PkgConfig::XRender) pkg_check_modules(XRender xrender IMPORTED_TARGET) + + if (NOT TARGET PkgConfig::XRender) + set(XRender_FOUND 0) + endif() endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f8793256b9..b3f5a880b1 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -7,6 +7,8 @@ set(OpenGL_GL_PREFERENCE GLVND) # special case: ##################################################################### # special case begin +qt_find_package(X11_XCB) + if (QT_FEATURE_gui) if (WINRT) set(_default_platform "winrt") diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 2aa73cbefe..71c3bb15c1 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -100,7 +100,7 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(XKB 0.4.1 PROVIDED_TARGETS XKB::XKB) endif() if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) - qt_find_package(XRender PROVIDED_TARGETS PkgConfig::xrender) + qt_find_package(XRender PROVIDED_TARGETS PkgConfig::XRender) endif() diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 77fda139cf..2d5dbbef1d 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -8,6 +8,7 @@ qt_find_package(XKB) qt_find_package(PkgConfig) qt_find_package(WrapFreetype) qt_find_package(GLIB2) +qt_find_package(XRender PROVIDED_TARGETS PkgConfig::XRender) pkg_check_modules(XKB_COMMON_X11 xkbcommon-x11>=0.4.1 IMPORTED_TARGET) # special case # end special case: @@ -118,6 +119,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib PUBLIC_LIBRARIES X11::XCB + X11::X11 # special case ) extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xinput @@ -160,7 +162,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender PUBLIC_LIBRARIES - PkgConfig::xrender + PkgConfig::XRender ) extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 97397e67ec..60128a8b03 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -249,7 +249,7 @@ _library_map = [ LibraryMapping('xkbcommon_x11', 'XKB', 'XKB::XKB', extra = ['0.4.1']), # see also xkbcommon LibraryMapping('xkbcommon', 'XKB', 'XKB::XKB', extra = ['0.4.1']), LibraryMapping('xlib', 'X11', 'X11::XCB'), # FIXME: Is this correct? - LibraryMapping('xrender', 'XRender', 'PkgConfig::xrender'), + LibraryMapping('xrender', 'XRender', 'PkgConfig::XRender'), LibraryMapping('zlib', 'ZLIB', 'ZLIB::ZLIB', extra=['REQUIRED']), LibraryMapping('zstd', 'ZSTD', 'ZSTD::ZSTD'), LibraryMapping('tiff', 'TIFF', 'TIFF::TIFF'), |