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

Mimic qmake by building our own xinput

Browse Source 
When we don't find the xinput library on the system, build it ourselves.

Change-Id: I399e847513cdd1c2dcdc1d862265284002f8808a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
This commit is contained in:
Leander Beernaert 2019-10-21 15:27:26 +02:00 committed by Simon Hausmann
parent 13f1be6cd6
commit c4b7f79e76
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ add_qt_module(XcbQpa
XCB::XCB XCB::XCB
XCB::XFIXES XCB::XFIXES
XCB::XINERAMA XCB::XINERAMA
XCB::XINPUT $<$<TARGET_EXISTS:XCB::XINPUT>:XCB::XINPUT> # special case
XCB::XKB XCB::XKB
XKB::XKB XKB::XKB
) )
@ -172,6 +172,21 @@ extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_p
LIBRARIES LIBRARIES
WrapFreetype::WrapFreetype WrapFreetype::WrapFreetype
) )
# special case begin
if (NOT QT_FEATURE_system_xcb_input)
set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c")
set_source_files_properties(
"${xinput_source}"
PROPERTIES COMPILE_OPTIONS "-w"
)
target_sources(XcbQpa PRIVATE "${xinput_source}")
target_include_directories(XcbQpa PRIVATE
"${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/include"
)
endif()
# special case end
##################################################################### #####################################################################
## qxcb Plugin: ## qxcb Plugin:
##################################################################### #####################################################################