commit: 3934ef31af8d45b378ad9f0fe4c0338f7a58a391
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Feb 23 22:22:10 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 22:35:02 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3934ef31
[kde-apps/okular] Fix tests-optional.patch
Package-Manager: portage-2.2.17
---
.../files/okular-5.9999-tests-optional.patch | 31 ++++++++++------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/kde-apps/okular/files/okular-5.9999-tests-optional.patch
b/kde-apps/okular/files/okular-5.9999-tests-optional.patch
index 9494cbc..309c092 100644
--- a/kde-apps/okular/files/okular-5.9999-tests-optional.patch
+++ b/kde-apps/okular/files/okular-5.9999-tests-optional.patch
@@ -1,24 +1,21 @@
---- a/CMakeLists.txt 2015-01-25 14:40:33.935040773 +0100
-+++ b/CMakeLists.txt 2015-01-25 14:42:53.287043165 +0100
-@@ -20,7 +20,7 @@
+--- a/CMakeLists.txt 2015-02-23 23:12:24.420881583 +0100
++++ b/CMakeLists.txt 2015-02-23 23:17:07.173858317 +0100
+@@ -18,7 +18,17 @@
include(ECMAddTests)
-find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets
PrintSupport Svg Qml Quick)
+find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport
Svg Qml Quick)
- find_package(KF5 REQUIRED COMPONENTS
- Activities
- Archive
-@@ -68,7 +68,11 @@
- add_subdirectory( ui )
- add_subdirectory( shell )
- add_subdirectory( generators )
--add_subdirectory( autotests )
+
-+if(BUILD_TESTING)
-+ find_package(Qt5Test CONFIG REQUIRED)
-+ add_subdirectory( autotests )
++find_package(Qt5Test CONFIG QUIET)
++set_package_properties(Qt5Test PROPERTIES
++ PURPOSE "Required for tests"
++ TYPE OPTIONAL)
++add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
++if (NOT Qt5Test_FOUND)
++ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+endif()
-
- add_subdirectory(doc)
-
++
+ find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
+ if (NOT Qt5TextToSpeech_FOUND)
+ message(STATUS "Qt5TextToSpeech not found, speech features will be
disabled")
