Unverified Commit 7a298732 authored by Andreas Sturmlechner's avatar Andreas Sturmlechner
Browse files

Add CMake option to build WITHOUT_X11, drop unused X11 dependency

We want to be able to build without X11 support even if some of the
used libraries may not work w/o X11 themselves yet or need to be built
with X11 support for other reverse dependencies.

KRULER_HAVE_X11 already exists and is set automagically so far, but
using -DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies
list X11 as required in their cmake config.

X11 dependency (introduced in 4c7cab8e

)
was not actually used at build time, so the new option will replace it
to determine if the feature is enabled, however libXCB remains
non-required.

Signed-off-by: default avatarAndreas Sturmlechner <asturm@gentoo.org>
parent bf3244e2
Pipeline #211163 passed with stage
in 2 minutes and 15 seconds
......@@ -41,14 +41,16 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
TYPE OPTIONAL
)
if (NOT APPLE)
find_package(X11)
set (KRULER_HAVE_X11 ${X11_FOUND})
if (X11_FOUND)
option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
if (NOT WITHOUT_X11)
find_package(XCB COMPONENTS XCB)
if (QT_MAJOR_VERSION STREQUAL "5")
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
else()
# qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above
set (KRULER_HAVE_X11 ${XCB_FOUND})
if (XCB_FOUND)
if (QT_MAJOR_VERSION STREQUAL "5")
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
else()
# qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above
endif()
endif()
endif()
endif()
......@@ -101,7 +103,7 @@ target_link_libraries(kruler
KF5::WindowSystem
KF5::XmlGui
)
if (X11_FOUND)
if (KRULER_HAVE_X11)
target_link_libraries(kruler
${XCB_LIBRARIES}
)
......
Supports Markdown
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