libkdegames: remove our kdeclarative-less build option

kreversi will require KgDeclarativeView

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-09-27 21:29:59 +02:00
parent 2a463291c9
commit 5b31756c10
2 changed files with 1 additions and 89 deletions

View File

@@ -1,85 +0,0 @@
From fffc82666c0cc3002b140b3598defc4923ce7bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 26 Apr 2015 17:28:12 +0200
Subject: [PATCH] CMakeLists.txt: add an option BUILD_KGDECLARATIVE disabled by
default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
on machines not supporting x11-egl (Raspberrypi / TI armv7) kdeclarative fails
to build. By this option we get the chance to build the library for these
machines and still suppprting many games.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5d8ffe..538d7c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,13 +8,18 @@ set (QT_MIN_VERSION "5.3.0")
find_package(ECM 1.3.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+option(BUILD_KGDECLARATIVE "Build kgdeclarativeview" OFF)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive
- DBusAddons DNSSD Declarative
+ DBusAddons DNSSD
I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash
Bookmarks KIO NewStuff)
+if(BUILD_KGDECLARATIVE)
+ find_package(KF5 REQUIRED COMPONENTS Declarative)
+endif()
+
include(FeatureSummary)
include(GenerateExportHeader)
include(ECMPackageConfigHelpers)
@@ -98,7 +103,6 @@ set(kdegames_LIB_SRCS
kgamerenderedobjectitem.cpp
kgamerendererclient.cpp
kgamerenderer.cpp
- kgdeclarativeview.cpp
kgimageprovider.cpp
kgdifficulty.cpp
kgtheme.cpp
@@ -107,6 +111,10 @@ set(kdegames_LIB_SRCS
kstandardgameaction.cpp
)
+if(BUILD_KGDECLARATIVE)
+ set(kdegames_LIB_SRCS kgdeclarativeview.cpp)
+endif()
+
add_library(KF5KDEGames SHARED ${kdegames_LIB_SRCS})
generate_export_header(KF5KDEGames BASE_NAME libkdegames EXPORT_MACRO_NAME KDEGAMES_EXPORT DEPRECATED_MACRO_NAME KDE_DEPRECATED)
@@ -117,7 +125,6 @@ target_link_libraries(KF5KDEGames
Qt5::Xml
Qt5::Svg
Qt5::Quick
- KF5::Declarative
KF5::KIOWidgets
KF5::NewStuff
KF5::IconThemes
@@ -132,6 +139,10 @@ target_link_libraries(KF5KDEGames
KF5::ConfigWidgets
)
+if(BUILD_KGDECLARATIVE)
+ target_link_libraries(KF5KDEGames PRIVATE KF5::Declarative)
+endif()
+
target_include_directories(KF5KDEGames INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KF5KDEGames;${KF5_INCLUDE_INSTALL_DIR}/KF5KDEGames/KDE;${KF5_INCLUDE_INSTALL_DIR}>")
set(KDEGAMES_VERSION 7.0.0)
--
2.5.0

View File

@@ -37,6 +37,7 @@ DEPENDS += "\
sonnet-native \
kxmlgui \
kdoctools \
kdeclarative \
\
openal-soft \
"
@@ -44,10 +45,6 @@ DEPENDS += "\
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ec256fe6b645b947a998bdbeff0fb336"
SRC_URI[sha256sum] = "ea7e571cbb1085c7a25dbeb1dcd9d2fa483da2f5c840d297580f6a7c438a888b"
SRC_URI += "file://0001-CMakeLists.txt-add-an-option-BUILD_KGDECLARATIVE-dis.patch"
PACKAGECONFIG[kgdeclarative] = "-DBUILD_KGDECLARATIVE=Yes,-DBUILD_KGDECLARATIVE=No, kdeclarative"
PACKAGECONFIG ??= ""
FILES_${PN} += " \
${datadir}/carddecks \