Commit 70352bd5 authored by Frederik Gladhorn's avatar Frederik Gladhorn

cmake: Clean X11 and QtX11Extras detection

Qt5X11Extras is already required a few lines above.
Xinput would fail the build if it's not found below. That in turn means
we need X11 as well. When getting rid of X11 dependencies for Wayland
and friends it will be easier to start with this simple set of rules.
parent 7b7c4115
......@@ -288,14 +288,9 @@ if (NOT WIN32 AND NOT APPLE)
TYPE OPTIONAL
PURPOSE "Optionally used to provide crash reporting on Linux")
find_package(X11)
if(X11_FOUND)
find_package(Qt5 ${MIN_QT_VERSION} REQUIRED NO_MODULE COMPONENTS X11Extras)
set(HAVE_X11 TRUE)
add_definitions(-DHAVE_X11)
else()
set(HAVE_X11 FALSE)
endif()
find_package(X11 REQUIRED COMPONENTS Xinput)
set(HAVE_X11 TRUE)
add_definitions(-DHAVE_X11)
find_package(XCB COMPONENTS XCB ATOM)
set(HAVE_XCB ${XCB_FOUND})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment