diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-02-23 23:22:10 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-02-24 23:35:02 +0100 |
| commit | 3934ef31af8d45b378ad9f0fe4c0338f7a58a391 (patch) | |
| tree | 614db3984c0164915e162b08f8c812c0fcd322e2 /kde-apps/okular/files | |
| parent | 4d41282df1b33980d30cad320a5566c0e3560ecf (diff) | |
| download | kde-3934ef31af8d45b378ad9f0fe4c0338f7a58a391.tar.gz kde-3934ef31af8d45b378ad9f0fe4c0338f7a58a391.tar.bz2 kde-3934ef31af8d45b378ad9f0fe4c0338f7a58a391.zip | |
[kde-apps/okular] Fix tests-optional.patch
Package-Manager: portage-2.2.17
Diffstat (limited to 'kde-apps/okular/files')
| -rw-r--r-- | kde-apps/okular/files/okular-5.9999-tests-optional.patch | 31 |
1 files 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 9494cbc7d7e..309c0921c1a 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") |
