106 lines
3.6 KiB
Diff
106 lines
3.6 KiB
Diff
From c2b4f8541374f4eca4d86cd59224c35aa846cc16 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
|
Date: Tue, 26 Jul 2016 11:41:26 +0200
|
|
Subject: [PATCH] build knsintegrate only on native
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
|
---
|
|
CMakeLists.txt | 5 +++++
|
|
libdiscover/CMakeLists.txt | 4 ++++
|
|
libdiscover/backends/CMakeLists.txt | 2 +-
|
|
libdiscover/backends/KNSBackend/CMakeLists.txt | 2 ++
|
|
4 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e8d9162..85e6fe2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -8,7 +8,7 @@ find_package(ECM REQUIRED NO_MODULE)
|
|
|
|
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake")
|
|
|
|
-find_package(Qt5 5.2.0 REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
|
|
+find_package(Qt5 5.2.0 REQUIRED CONFIG COMPONENTS Core)
|
|
include(KDEInstallDirs)
|
|
include(KDECMakeSettings)
|
|
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
|
|
@@ -17,6 +17,7 @@ include(ECMMarkAsTest)
|
|
include(ECMAddTests)
|
|
include(GenerateExportHeader)
|
|
|
|
+if(False)
|
|
find_package(KF5 5.24 REQUIRED CoreAddons Config Crash DBusAddons I18n Archive Declarative XmlGui)
|
|
find_package(KF5Kirigami 1.1)
|
|
|
|
@@ -33,8 +34,10 @@ find_package(KF5Attica 5.23)
|
|
find_package(KF5NewStuff 5.23)
|
|
|
|
configure_file(DiscoverVersion.h.in DiscoverVersion.h)
|
|
+endif()
|
|
|
|
add_subdirectory(libdiscover)
|
|
+if(False)
|
|
add_subdirectory(discover)
|
|
add_subdirectory(exporter)
|
|
|
|
@@ -81,3 +84,4 @@ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
|
|
|
|
find_package(KF5I18n CONFIG REQUIRED)
|
|
ki18n_install(po)
|
|
+endif()
|
|
diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
|
|
index 2ee7503..28ca4ef 100644
|
|
--- a/libdiscover/CMakeLists.txt
|
|
+++ b/libdiscover/CMakeLists.txt
|
|
@@ -1,6 +1,7 @@
|
|
add_definitions(-DTRANSLATION_DOMAIN=\"libdiscover\")
|
|
|
|
add_subdirectory(backends)
|
|
+if(False)
|
|
add_subdirectory(declarative)
|
|
add_subdirectory(notifiers)
|
|
add_subdirectory(tests)
|
|
@@ -58,3 +59,6 @@ target_include_directories(DiscoverCommon PRIVATE ${PHONON_INCLUDES} PUBLIC ${CM
|
|
|
|
install(TARGETS DiscoverCommon DESTINATION ${CMAKE_INSTALL_LIBDIR}/plasma-discover)
|
|
install(FILES resources/discoverabstractnotifier.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
|
|
+
|
|
+endif()
|
|
+
|
|
diff --git a/libdiscover/backends/CMakeLists.txt b/libdiscover/backends/CMakeLists.txt
|
|
index 93497f6..9580fcc 100644
|
|
--- a/libdiscover/backends/CMakeLists.txt
|
|
+++ b/libdiscover/backends/CMakeLists.txt
|
|
@@ -8,7 +8,7 @@ function(add_unit_test name)
|
|
Qt5::Test Qt5::Core ${EXTRA_LIBS})
|
|
endfunction()
|
|
|
|
-if(KF5Attica_FOUND AND KF5NewStuff_FOUND)
|
|
+if(True)
|
|
add_subdirectory(KNSBackend)
|
|
endif()
|
|
|
|
diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt
|
|
index 9cb3e96..719a27e 100644
|
|
--- a/libdiscover/backends/KNSBackend/CMakeLists.txt
|
|
+++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
|
|
@@ -1,4 +1,5 @@
|
|
add_subdirectory(knsintegrate)
|
|
+if(False)
|
|
add_subdirectory(tests)
|
|
|
|
function(makekns knsfile iconName category)
|
|
@@ -32,3 +33,4 @@ install(TARGETS kns-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
|
|
makekns(comic.knsrc face-smile-big "Plasma Addons/Comics")
|
|
makekns(plasmoids.knsrc plasma "Plasma Addons/Plasma Desktop Widgets")
|
|
makekns(custom/discover_ktexteditor_codesnippets_core.knsrc kate "Application Addons/Kate Snippets")
|
|
+endif()
|
|
--
|
|
2.5.5
|
|
|