Make KIdleTime build without X11

This commit is contained in:
Volker Krause
2017-08-05 18:37:01 +02:00
parent bb04c265e3
commit 81e46b5973
2 changed files with 41 additions and 2 deletions

View File

@@ -5,9 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
PR = "r0"
DEPENDS = "qtbase qtx11extras"
DEPENDS = " \
qtbase \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \
"
SRC_URI = "git://anongit.kde.org/kidletime"
SRC_URI = " \
git://anongit.kde.org/kidletime \
file://0001-no-x11.patch \
"
S = "${WORKDIR}/git"
inherit cmake_kf5

View File

@@ -0,0 +1,33 @@
commit 8dbea8f26466f605961b66e8c3ae2da5f88a50a9
Author: Volker Krause <vkrause@kde.org>
Date: Sat Aug 5 18:35:10 2017 +0200
Only require Qt5X11Extras when we actually need it
Reviewers: #frameworks
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D7154
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1111d73..e3c89d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ set(REQUIRED_QT_VERSION 5.6.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets)
if(NOT WIN32 AND NOT APPLE)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras DBus)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
endif()
if(APPLE)
@@ -46,6 +46,7 @@ if(NOT APPLE)
endif()
if(X11_FOUND)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
find_package(XCB COMPONENTS XCB SYNC)
find_package(X11_XCB)
set(HAVE_X11 TRUE)