add kactivities 5.5.0

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2014-12-05 11:22:30 +01:00
parent 608d9b7622
commit 847a204d9b
2 changed files with 81 additions and 0 deletions

View File

@@ -0,0 +1,62 @@
From 08e119b0775333ddf912ef7e724f9aa7e8cfd0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 5 Dec 2014 10:41:28 +0100
Subject: [PATCH] replace try_run by try_compile in compiler feature check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
try_run does not work in cross environments
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
cmake/modules/CheckCxxFeatures.cmake | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/cmake/modules/CheckCxxFeatures.cmake b/cmake/modules/CheckCxxFeatures.cmake
index 95b9542..e751113 100644
--- a/cmake/modules/CheckCxxFeatures.cmake
+++ b/cmake/modules/CheckCxxFeatures.cmake
@@ -7,19 +7,18 @@ set(CXX_FEATURES_UNSUPPORTED "")
macro(CXX_PERFORM_TEST TEST_SOURCE_FILE TEST_TEST_BINARY_DIR EXPECTED_RESULT RESULT COMPILE_DEFINITIONS)
- try_run(
- RUN_RESULT_VAR COMPILE_RESULT_VAR
+ try_compile(
+ COMPILE_RESULT_VAR
"${TEST_BINARY_DIR}" "${TEST_SOURCE_FILE}"
COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
- COMPILE_OUTPUT_VARIABLE COMPILE_OUT
- RUN_OUTPUT_VARIABLE RUN_OUT
+ OUTPUT_VARIABLE COMPILE_OUT
)
set(RESULT_VAR FALSE)
- if (COMPILE_RESULT_VAR AND NOT RUN_RESULT_VAR)
+ if (COMPILE_RESULT_VAR)
set(RESULT_VAR TRUE)
- endif (COMPILE_RESULT_VAR AND NOT RUN_RESULT_VAR)
+ endif (COMPILE_RESULT_VAR)
if (NOT ("${RESULT_VAR}" STREQUAL "${EXPECTED_RESULT}"))
# message ("Got ${RESULT_VAR} as a result, but ${EXPECTED_RESULT} expected")
@@ -29,12 +28,6 @@ macro(CXX_PERFORM_TEST TEST_SOURCE_FILE TEST_TEST_BINARY_DIR EXPECTED_RESULT RES
# message("${COMPILE_OUT}")
endif (NOT ${COMPILE_RESULT_VAR})
- if (${RUN_RESULT_VAR})
- # message("---------- run output ----------")
- # message("${RUN_OUT}")
- # message("Process returned: ${RUN_RESULT_VAR}")
- endif (${RUN_RESULT_VAR})
-
# message("--------------------------------")
set (${RESULT} FALSE)
--
1.8.3.1

View File

@@ -0,0 +1,19 @@
SUMMARY = "Runtime and library to organize the user work in separate activities"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = " \
file://src/service/common.h;endline=18;md5=c6cc045ed732acc1204af0c74a0418b0 \
"
inherit kde cmake-lib
DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui kio kdbusaddons kdeclarative kcmutils"
SRCREV = "25f2c49862918f8cdf61d878f13889d6f410d60c"
SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
# cross libs / headers
CMAKE_HIDE_ERROR[1] = "KF5Activities, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_HIDE_ERROR[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${datadir}/k*5 ${libdir}/plugins ${libdir}/qml/org/kde"
FILES_${PN}-dbg += "${libdir}/plugins/.debug ${libdir}/plugins/*/.debug ${libdir}/qml/org/kde/*/.debug"