diff options
3 files changed, 34 insertions, 59 deletions
diff --git a/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch b/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch deleted file mode 100644 index 62a71866a9f..00000000000 --- a/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/CMakeLists.txt 2015-01-18 21:48:57.436568121 +0100 -+++ b/CMakeLists.txt 2015-01-18 21:49:04.667567906 +0100 -@@ -1,5 +1,3 @@ --enable_testing() -- - project(libkdegames) - - cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) -@@ -9,7 +7,7 @@ - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) - find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive - DBusAddons DNSSD Declarative - I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash -@@ -51,7 +49,10 @@ - add_subdirectory( highscore ) - add_subdirectory( includes ) - add_subdirectory( libkdegamesprivate ) --add_subdirectory( tests ) -+ -+if(BUILD_TESTING) -+ add_subdirectory( tests ) -+endif() - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/highscore ---- a/tests/CMakeLists.txt 2015-01-18 21:34:42.477593601 +0100 -+++ b/tests/CMakeLists.txt 2015-01-18 21:39:09.461585644 +0100 -@@ -1,3 +1,5 @@ -+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) -+ - set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) - include_directories( ${CMAKE_SOURCE_DIR}/libkdegames ) - ---- a/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 -+++ b/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:51:18.496563917 +0100 -@@ -1,7 +1,8 @@ --enable_testing() - project(libkdegamesprivate) - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory( tests ) -+endif() - - # NOTE: The libkdegamesprivate target is compiled in the parent directory, - # because CMake can't cope with exported libraries in two different ---- a/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 -+++ b/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:54:04.201558979 +0100 -@@ -1,3 +1,5 @@ -+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) -+ - set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) - diff --git a/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch b/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch new file mode 100644 index 00000000000..fa07df00549 --- /dev/null +++ b/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2664fd4..32f453b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,3 @@ +-enable_testing() +- + project(libkdegames) + + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +@@ -9,12 +7,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) + find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive + DBusAddons DNSSD Declarative + I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash + Bookmarks KIO NewStuff KDELibs4Support) + ++find_package(Qt5Test ${QT_MIN_VERSION} 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() ++ + include(FeatureSummary) + include(GenerateExportHeader) + include(ECMPackageConfigHelpers) diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild index 2b635adac18..0637f23296d 100644 --- a/kde-apps/libkdegames/libkdegames-9999.ebuild +++ b/kde-apps/libkdegames/libkdegames-9999.ebuild @@ -48,4 +48,4 @@ DEPEND=" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-5.9999-buildsystem.patch" ) +PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" ) |