1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Fix xcb build

Browse Source 
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>
This commit is contained in:
Albert Astals Cid 2019-06-04 09:19:17 +02:00
parent 5715ef13d2
commit 9e6781b69e
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/FindXRender.cmake
View File

@ -1,5 +1,9 @@
include(FindPkgConfig) include(FindPkgConfig)
if(NOT TARGET PkgConfig::xrender) if(NOT TARGET PkgConfig::XRender)
pkg_check_modules(XRender xrender IMPORTED_TARGET) pkg_check_modules(XRender xrender IMPORTED_TARGET)
if (NOT TARGET PkgConfig::XRender)
set(XRender_FOUND 0)
endif()
endif() endif()

2
src/gui/CMakeLists.txt
View File

@ -7,6 +7,8 @@ set(OpenGL_GL_PREFERENCE GLVND) # special case:
##################################################################### #####################################################################
# special case begin # special case begin
qt_find_package(X11_XCB)
if (QT_FEATURE_gui) if (QT_FEATURE_gui)
if (WINRT) if (WINRT)
set(_default_platform "winrt") set(_default_platform "winrt")

2
src/gui/configure.cmake
View File

@ -100,7 +100,7 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
qt_find_package(XKB 0.4.1 PROVIDED_TARGETS XKB::XKB) qt_find_package(XKB 0.4.1 PROVIDED_TARGETS XKB::XKB)
endif() endif()
if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) 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() endif()

4
src/plugins/platforms/xcb/CMakeLists.txt
View File

@ -8,6 +8,7 @@ qt_find_package(XKB)
qt_find_package(PkgConfig) qt_find_package(PkgConfig)
qt_find_package(WrapFreetype) qt_find_package(WrapFreetype)
qt_find_package(GLIB2) 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 pkg_check_modules(XKB_COMMON_X11 xkbcommon-x11>=0.4.1 IMPORTED_TARGET) # special case
# end special case: # end special case:
@ -118,6 +119,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
X11::XCB X11::XCB
X11::X11 # special case
) )
extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xinput 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 extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
PkgConfig::xrender PkgConfig::XRender
) )
extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting

2
util/cmake/helper.py
View File

@ -249,7 +249,7 @@ _library_map = [
LibraryMapping('xkbcommon_x11', 'XKB', 'XKB::XKB', extra = ['0.4.1']), # see also xkbcommon LibraryMapping('xkbcommon_x11', 'XKB', 'XKB::XKB', extra = ['0.4.1']), # see also xkbcommon
LibraryMapping('xkbcommon', 'XKB', 'XKB::XKB', extra = ['0.4.1']), LibraryMapping('xkbcommon', 'XKB', 'XKB::XKB', extra = ['0.4.1']),
LibraryMapping('xlib', 'X11', 'X11::XCB'), # FIXME: Is this correct? 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('zlib', 'ZLIB', 'ZLIB::ZLIB', extra=['REQUIRED']),
LibraryMapping('zstd', 'ZSTD', 'ZSTD::ZSTD'), LibraryMapping('zstd', 'ZSTD', 'ZSTD::ZSTD'),
LibraryMapping('tiff', 'TIFF', 'TIFF::TIFF'), LibraryMapping('tiff', 'TIFF', 'TIFF::TIFF'),