diff options
Diffstat (limited to 'kde-frameworks/extra-cmake-modules/files')
3 files changed, 0 insertions, 120 deletions
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch deleted file mode 100644 index 84e192919c7..00000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 11 Jul 2020 23:04:16 +0200 -Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not - available - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - modules/ECMAddTests.cmake | 9 +++++++++ - tests/ECMAddTests/CMakeLists.txt | 5 +++++ - 2 files changed, 14 insertions(+) - -diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake -index 58c78d05..994ed1e4 100644 ---- a/modules/ECMAddTests.cmake -+++ b/modules/ECMAddTests.cmake -@@ -84,6 +84,10 @@ function(ecm_add_test) - message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") - endif() - -+ if(NOT TARGET Qt::Test) -+ return() -+ endif() -+ - set(_testname ${ARG_NAME_PREFIX}${_targetname}) - set(gui_args) - if(ARG_GUI) -@@ -127,6 +131,11 @@ function(ecm_add_tests) - endif() - set(test_names) - set(target_names) -+ -+ if(NOT TARGET Qt::Test) -+ return() -+ endif() -+ - foreach(_test_source ${ARG_UNPARSED_ARGUMENTS}) - ecm_add_test(${_test_source} - NAME_PREFIX ${ARG_NAME_PREFIX} -diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt -index aa7e73a1..f9fb10cb 100644 ---- a/tests/ECMAddTests/CMakeLists.txt -+++ b/tests/ECMAddTests/CMakeLists.txt -@@ -4,6 +4,11 @@ else() - set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF") - endif() - -+if(NOT TARGET Qt::Test) -+ message(STATUS "WARNING: skipping tests that require Qt::Test") -+ return() -+endif() -+ - macro(add_check NAME) - string(REPLACE "." "/" dir "${NAME}") - string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}") --- -2.35.1 - diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-ECMSetupQtPluginMacroNames.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-ECMSetupQtPluginMacroNames.patch deleted file mode 100644 index 0eb32a9d477..00000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-ECMSetupQtPluginMacroNames.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ce890f958bf86f4af4a2357e73709d4338c35588 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" <kossebau@kde.org> -Date: Tue, 7 Oct 2025 13:33:01 +0200 -Subject: [PATCH] ECMSetupQtPluginMacroNames: fix setting up names for own - build - -* asturm 2025-10-09: amends b18a78882894b813aec21a64f9d5e4ee358a1143 (in 6.18) - ---- - modules/ECMSetupQtPluginMacroNames.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ECMSetupQtPluginMacroNames.cmake b/modules/ECMSetupQtPluginMacroNames.cmake -index 1e023211..22658df0 100644 ---- a/modules/ECMSetupQtPluginMacroNames.cmake -+++ b/modules/ECMSetupQtPluginMacroNames.cmake -@@ -139,7 +139,7 @@ macro(ecm_setup_qtplugin_macro_names) - - - # CMAKE_AUTOMOC_MACRO_NAMES -- list(APPEND CMAKE_AUTOMOC_MACRO_NAMES $[_macro_names}) -+ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES ${_macro_names}) - - # CMAKE_AUTOMOC_DEPEND_FILTERS - # CMake's automoc needs help to find names of plugin metadata files in case Q_PLUGIN_METADATA --- -GitLab - diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-fix-CMP0177-warning.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-fix-CMP0177-warning.patch deleted file mode 100644 index 02e5a978465..00000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.18.0-fix-CMP0177-warning.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 850ef6c884f24773abced96ba65cf497aae946e1 Mon Sep 17 00:00:00 2001 -From: Allen Winter <winter@kde.org> -Date: Thu, 2 Oct 2025 09:10:21 -0400 -Subject: [PATCH] CMakeLists.txt - remove trailing '/' to fix CMP0177 warning - -KDE_MODULES_INSTALL_DIR needs to be normalized for -the install(PROGRAMS) command. The easiest solution -is to not have a trailing '/'. - -Fixes: -``` -CMake Warning (dev) at CMakeLists.txt:96 (install): -Policy CMP0177 is not set: install() DESTINATION paths are normalized. -``` ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8de8636..2896268b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ set(SHARE_INSTALL_DIR share - set(CMAKECONFIG_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/cmake/) - - set(FIND_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/find-modules/) --set(KDE_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/kde-modules/) -+set(KDE_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/kde-modules) - set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/modules/) - set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/) - --- -GitLab - |