kauth: fix build

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2014-11-27 09:46:18 +01:00
parent f6eaa1a27f
commit 7bca318aa0
2 changed files with 49 additions and 1 deletions

View File

@@ -0,0 +1,43 @@
From 3418e7c05012cf9cf5058132b12418e739bf62fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 27 Nov 2014 09:19:51 +0100
Subject: [PATCH] Make autotests optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [config]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e047a94..30edce6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,9 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KAUTH
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AuthConfigVersion.cmake"
SOVERSION 5)
+# unset for cross environments
+option(AUTOTESTS "Perform autotests" ON)
+
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
set(KAUTH_HELPER_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}/kauth")
@@ -37,7 +40,9 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
endif()
add_subdirectory(src)
-add_subdirectory(autotests)
+if(AUTOTESTS)
+ add_subdirectory(autotests)
+endif()
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Auth")
--
1.8.3.1

View File

@@ -6,8 +6,13 @@ LIC_FILES_CHKSUM = " \
inherit kde
SRC_URI += " \
file://0001-Make-autotests-optional.patch \
"
SRCREV = "4f6d10cdc59aca6819e4189e81ff65150559bc10"
PV = "5.5.0"
EXTRA_OECMAKE += "-DAUTOTESTS=OFF"
FILES_${PN} += "${datadir} ${libdir}/plugins"
FILES_${PN}-dbg += "${libdir}/plugins/*/.debug"
FILES_${PN}-dbg += "${libdir}/plugins/*/*/.debug"