Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-extra-cmake-modules for
openSUSE:Factory checked in at 2025-08-09 19:57:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.1085 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-extra-cmake-modules"
Sat Aug 9 19:57:33 2025 rev:18 rq:1298516 version:6.17.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kf6-extra-cmake-modules/kf6-extra-cmake-modules.changes
2025-07-14 10:52:09.773781657 +0200
+++
/work/SRC/openSUSE:Factory/.kf6-extra-cmake-modules.new.1085/kf6-extra-cmake-modules.changes
2025-08-09 20:02:15.488345333 +0200
@@ -1,0 +2,13 @@
+Mon Aug 4 06:57:19 UTC 2025 - Christophe Marin <christo...@krop.fr>
+
+- Update to 6.17.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.17.0
+- Changes since 6.16.0:
+ * ECMSetupVersion: Adapt to the removal of CMP0048 with cmake 4.0
(kde#504518)
+ * KDEGitCommitHooks: Do not ignore clang format return code
+ * KDEGitCommitHooks: Allow custom user scripts in pre-commit.d directory
+ * Update version to 6.17.0
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-6.16.0.tar.xz
extra-cmake-modules-6.16.0.tar.xz.sig
New:
----
extra-cmake-modules-6.17.0.tar.xz
extra-cmake-modules-6.17.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.p099Jg/_old 2025-08-09 20:02:17.812441874 +0200
+++ /var/tmp/diff_new_pack.p099Jg/_new 2025-08-09 20:02:17.836442870 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kf6-extra-cmake-modules
#
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,12 +23,12 @@
%define rname extra-cmake-modules
-# Full KF6 version (e.g. 6.16.0)
+# Full KF6 version (e.g. 6.17.0)
%{!?_kf6_version: %global _kf6_version %{version}}
%bcond_without doc
%bcond_without released
Name: kf6-extra-cmake-modules%{?pkg_suffix}
-Version: 6.16.0
+Version: 6.17.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-6.16.0.tar.xz -> extra-cmake-modules-6.17.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.16.0/.gitlab-ci.yml
new/extra-cmake-modules-6.17.0/.gitlab-ci.yml
--- old/extra-cmake-modules-6.16.0/.gitlab-ci.yml 2025-07-04
17:09:17.000000000 +0200
+++ new/extra-cmake-modules-6.17.0/.gitlab-ci.yml 2025-08-01
12:28:40.000000000 +0200
@@ -5,14 +5,10 @@
- project: sysadmin/ci-utilities
file:
- /gitlab-templates/linux.yml
- - /gitlab-templates/linux-static.yml
- - /gitlab-templates/freebsd.yml
- /gitlab-templates/android-qt6.yml
- /gitlab-templates/linux-qt6.yml
- /gitlab-templates/linux-qt6-next.yml
- /gitlab-templates/linux-qt6-static.yml
- - /gitlab-templates/windows.yml
- - /gitlab-templates/windows-static.yml
- /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/windows-qt6.yml
- /gitlab-templates/alpine-qt6.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-6.16.0/CMakeLists.txt
new/extra-cmake-modules-6.17.0/CMakeLists.txt
--- old/extra-cmake-modules-6.16.0/CMakeLists.txt 2025-07-04
17:09:17.000000000 +0200
+++ new/extra-cmake-modules-6.17.0/CMakeLists.txt 2025-08-01
12:28:40.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "6.16.0") # handled by release scripts
+set(VERSION "6.17.0") # handled by release scripts
project(ECM
VERSION "${VERSION}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/kde-modules/KDEGitCommitHooks.cmake
new/extra-cmake-modules-6.17.0/kde-modules/KDEGitCommitHooks.cmake
--- old/extra-cmake-modules-6.16.0/kde-modules/KDEGitCommitHooks.cmake
2025-07-04 17:09:17.000000000 +0200
+++ new/extra-cmake-modules-6.17.0/kde-modules/KDEGitCommitHooks.cmake
2025-08-01 12:28:40.000000000 +0200
@@ -24,6 +24,9 @@
In addition to that, you can pass in paths to custom scripts that will be run
as the pre-commit hook.
If a custom hooks directory is set via ``core.hooksPath``, a warning is issued.
+The created pre-commit script will also execute any custom user-provided
+scripts located in .git/hooks/pre-commit.d directory.
+
Checks:
- ``CLANG_FORMAT`` With this check enabled the ``git clang-format`` tool will
be used to make sure that
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/kde-modules/kde-git-commit-hooks/pre-commit.in
new/extra-cmake-modules-6.17.0/kde-modules/kde-git-commit-hooks/pre-commit.in
---
old/extra-cmake-modules-6.16.0/kde-modules/kde-git-commit-hooks/pre-commit.in
2025-07-04 17:09:17.000000000 +0200
+++
new/extra-cmake-modules-6.17.0/kde-modules/kde-git-commit-hooks/pre-commit.in
2025-08-01 12:28:40.000000000 +0200
@@ -1,3 +1,25 @@
#!/usr/bin/env bash
${PRE_COMMIT_SCRIPTS}
+
+RESULT=$?
+if [ $RESULT != 0 ]; then
+ exit $RESULT
+fi
+
+# If the user has custom commit hooks defined in pre-commit.d directory,
+# execute them
+PRE_COMMIT_D_DIR="$(dirname "$0")/pre-commit.d/"
+
+if [ -d "$PRE_COMMIT_D_DIR" ]; then
+ for PRE_COMMIT_D_HOOK in "$PRE_COMMIT_D_DIR"/*; do
+ ./"$PRE_COMMIT_D_HOOK"
+ RESULT=$?
+ if [ $RESULT != 0 ]; then
+ echo "$PRE_COMMIT_D_HOOK returned non-zero: $RESULT, commit
aborted"
+ exit $RESULT
+ fi
+ done
+fi
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/modules/ECMGeneratePkgConfigFile.cmake
new/extra-cmake-modules-6.17.0/modules/ECMGeneratePkgConfigFile.cmake
--- old/extra-cmake-modules-6.16.0/modules/ECMGeneratePkgConfigFile.cmake
2025-07-04 17:09:17.000000000 +0200
+++ new/extra-cmake-modules-6.17.0/modules/ECMGeneratePkgConfigFile.cmake
2025-08-01 12:28:40.000000000 +0200
@@ -74,7 +74,8 @@
To properly use this macro a version needs to be set. To retrieve it,
``ECM_PKGCONFIG_INSTALL_DIR`` uses ``PROJECT_VERSION``. To set it, use the
-``project()`` command or the ``ecm_setup_version()`` macro
+``project()`` command (or if you still set CMP0048 to OLD and don't have
+CMake >= 4 the ``ecm_setup_version()`` macro)
Example usage:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/modules/ECMSetupVersion.cmake
new/extra-cmake-modules-6.17.0/modules/ECMSetupVersion.cmake
--- old/extra-cmake-modules-6.16.0/modules/ECMSetupVersion.cmake
2025-07-04 17:09:17.000000000 +0200
+++ new/extra-cmake-modules-6.17.0/modules/ECMSetupVersion.cmake
2025-08-01 12:28:40.000000000 +0200
@@ -36,8 +36,8 @@
<prefix>_VERSION_STRING - <version> (use <prefix>_VERSION instead)
-If CMake policy CMP0048 is not ``NEW``, the following CMake variables will also
-be set::
+With CMake versions older than 4.0.0 and if CMake policy CMP0048 is not
``NEW``,
+the following CMake variables will also be set::
PROJECT_VERSION_MAJOR - <major>
PROJECT_VERSION_MINOR - <minor>
@@ -72,8 +72,8 @@
optional ``COMPATIBILITY`` option is forwarded to
``write_basic_package_version_file()``, and defaults to ``AnyNewerVersion``.
-If CMake policy CMP0048 is ``NEW``, an alternative form of the command is
-available::
+With CMake versions >= 4.0.0 or if CMake policy CMP0048 is ``NEW``, an
alternative
+form of the command is available::
ecm_setup_version(PROJECT
[VARIABLE_PREFIX <prefix>]
@@ -110,14 +110,21 @@
set(project_manages_version FALSE)
set(use_project_version FALSE)
- cmake_policy(GET CMP0048 project_version_policy)
- if(project_version_policy STREQUAL "NEW")
+ if(CMAKE_MAJOR_VERSION VERSION_GREATER_EQUAL 4)
set(project_manages_version TRUE)
if(_version STREQUAL "PROJECT")
set(use_project_version TRUE)
endif()
- elseif(_version STREQUAL "PROJECT")
- message(FATAL_ERROR "ecm_setup_version given PROJECT argument, but
CMP0048 is not NEW")
+ else()
+ cmake_policy(GET CMP0048 project_version_policy)
+ if(project_version_policy STREQUAL "NEW")
+ set(project_manages_version TRUE)
+ if(_version STREQUAL "PROJECT")
+ set(use_project_version TRUE)
+ endif()
+ elseif(_version STREQUAL "PROJECT")
+ message(FATAL_ERROR "ecm_setup_version given PROJECT argument, but
CMP0048 is not NEW")
+ endif()
endif()
set(should_set_prefixed_vars TRUE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt
2025-07-04 17:09:17.000000000 +0200
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -1,9 +1,20 @@
-set(MODULES_DIR "${ECM_SOURCE_DIR}/modules")
-configure_file(run_test.cmake.config
"${CMAKE_CURRENT_BINARY_DIR}/run_test.cmake" @ONLY)
-add_test(
- NAME ECMGeneratePkgConfigFile
- COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/run_test.cmake")
+macro(add_pkgconfig_test NAME)
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
+
+ add_test(NAME ecm_generate_pkgconfig-${NAME}
+ COMMAND ${CMAKE_COMMAND} "${CMAKE_CURRENT_SOURCE_DIR}/${NAME}"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"
+ )
+endmacro()
+
+add_pkgconfig_test(no_optional_arguments)
+add_pkgconfig_test(no_description_parameter_metainfo_with_description-param)
+add_pkgconfig_test(no_description_parameter_metainfo_with_empty_description)
+add_pkgconfig_test(no_description_parameter_metainfo_without_description)
+add_pkgconfig_test(with_public_and_private_dependencies)
+add_pkgconfig_test(with_an_URL_parameter)
+add_pkgconfig_test(custom_defines)
add_subdirectory(test_imported_targets)
add_subdirectory(test_no_interface_include_dirs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/custom_defines/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/custom_defines/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/custom_defines/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/custom_defines/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(custom_defines VERSION 6.7.0)
+
+include(../test-and-comparison-helpers.cmake)
+
+include(ECMGeneratePkgConfigFile)
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT VARIABLE_PREFIX ATTICA
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/attica_version.h"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF6AtticaConfigVersion.cmake"
+ SOVERSION 6)
+
+set(origfiles
"${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/KF6Attica.pc")
+
+ecm_generate_pkgconfig_file(BASE_NAME KF6Attica
+ DESCRIPTION "Qt library to access Open
Collaboration Services"
+ LIB_NAME KF6Attica
+ INCLUDE_INSTALL_DIR /usr/include/Attica
+ DEFINES -I\${prefix}/include/foo
-I\${prefix}/include/bar
+ DEPS Qt6Core Qt6Network
+ FILENAME_VAR OutputFile
+ )
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_description-param/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_description-param/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_description-param/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_description-param/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(no_description_parameter_metainfo_with_description-param VERSION 5.43)
+
+include(../test-and-comparison-helpers.cmake)
+
+include(ECMGeneratePkgConfigFile)
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT VARIABLE_PREFIX KCOREADDONS
+ VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake"
+ SOVERSION 5)
+
+set(origfiles
"${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc")
+
+file(COPY
${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/metainfo_with_description.yaml
+ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
+file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_with_description.yaml
${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons2
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
+file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_empty_description/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_empty_description/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_empty_description/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_with_empty_description/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(no_description_parameter_metainfo_with_description-param VERSION 5.43)
+
+include(../test-and-comparison-helpers.cmake)
+
+include(ECMGeneratePkgConfigFile)
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT VARIABLE_PREFIX KCOREADDONS
+ VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake"
+ SOVERSION 5)
+
+set(origfiles
"${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc")
+
+file(COPY
${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/metainfo_with_empty_description.yaml
+ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
+file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_with_empty_description.yaml
${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons3
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
+file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_without_description/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_without_description/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_without_description/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_description_parameter_metainfo_without_description/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(no_description_parameter_metainfo_without_description VERSION 5.43)
+
+include(../test-and-comparison-helpers.cmake)
+
+include(ECMGeneratePkgConfigFile)
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT VARIABLE_PREFIX KCOREADDONS
+ VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake"
+ SOVERSION 5)
+
+set(origfiles
"${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc")
+
+file(COPY
${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
+ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
+file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_without_description.yaml
${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons3
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
+file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_optional_arguments/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_optional_arguments/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/no_optional_arguments/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/no_optional_arguments/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(no_optional_arguments VERSION 5.43)
+
+include(../test-and-comparison-helpers.cmake)
+
+include(ECMGeneratePkgConfigFile)
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT VARIABLE_PREFIX KCOREADDONS
+ VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake"
+ SOVERSION 5)
+
+set(origfiles
"${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc")
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons
+ DESCRIPTION "KF5CoreAddons test"
+ DEPS Qt5Core
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
2025-07-04 17:09:17.000000000 +0200
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
1970-01-01 01:00:00.000000000 +0100
@@ -1,161 +0,0 @@
-set(CMAKE_MODULE_PATH "@MODULES_DIR@")
-set(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
-set(CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@")
-
-set(CMAKE_INSTALL_PREFIX "/usr")
-
-include(ECMGeneratePkgConfigFile)
-include(ECMSetupVersion)
-
-
-function (compare_files)
- set(options)
- set(oneValueArgs GENERATED ORIGINALS)
- set(multiValueArgs)
- cmake_parse_arguments(CF "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
- list(LENGTH CF_GENERATED count)
- math(EXPR last "${count}-1")
- foreach(i RANGE ${last})
- list(GET CF_GENERATED ${i} generated_file)
- if (NOT EXISTS "${generated_file}")
- message(FATAL_ERROR "${generated_file} was not generated")
- endif()
- file(READ "${generated_file}" file_contents)
- string(STRIP "${file_contents}" file_contents)
-
- list(GET CF_ORIGINALS ${i} original_file)
- if (NOT EXISTS "${original_file}")
- message(FATAL_ERROR "Original ${original_file} was not found")
- endif()
- file(READ "${original_file}" original_contents)
- string(STRIP "${original_contents}" original_contents)
-
- if(NOT original_contents STREQUAL file_contents)
- message(FATAL_ERROR "Different files: ${original_file}
${generated_file}")
- endif()
- endforeach()
-endfunction()
-
-###########################################################
-
-
-ecm_setup_version(5.43 VARIABLE_PREFIX KCOREADDONS
- VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h"
- PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake"
- SOVERSION 5)
-
-message(STATUS "Test 1: no optional arguments")
-set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons.pc")
-
-ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons
- DESCRIPTION "KF5CoreAddons test"
- DEPS Qt5Core
- FILENAME_VAR OutputFile)
-
-compare_files(GENERATED ${OutputFile}
- ORIGINALS ${origfiles})
-file(REMOVE ${OutputFile})
-
-message(STATUS "Test2: no description parameter, metainfo.yaml with
description found")
-set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons2.pc")
-
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_with_description.yaml
- DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/metainfo_with_description.yaml
${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons2
- DEPS Qt5Core
- INCLUDE_INSTALL_DIR /usr/KCoreAddons
- FILENAME_VAR OutputFile)
-
-compare_files(GENERATED ${OutputFile}
- ORIGINALS ${origfiles})
-file(REMOVE ${OutputFile})
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-message(STATUS "Test3: no description parameter, metainfo.yaml with empty
description found")
-set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons3.pc")
-
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_with_empty_description.yaml
- DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/metainfo_with_empty_description.yaml
${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons3
- DEPS Qt5Core
- INCLUDE_INSTALL_DIR /usr/KCoreAddons
- FILENAME_VAR OutputFile)
-
-compare_files(GENERATED ${OutputFile}
- ORIGINALS ${origfiles})
-file(REMOVE ${OutputFile})
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-message(STATUS "Test4: no description parameter, metainfo.yaml without
description")
-set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons3.pc")
-
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_without_description.yaml
- DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/metainfo_without_description.yaml
${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons3
- DEPS Qt5Core
- INCLUDE_INSTALL_DIR /usr/KCoreAddons
- FILENAME_VAR OutputFile)
-
-compare_files(GENERATED ${OutputFile}
- ORIGINALS ${origfiles})
-file(REMOVE ${OutputFile})
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-message(STATUS "Test5: with public and private dependencies")
-set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons4.pc")
-
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_without_description.yaml
- DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/metainfo_without_description.yaml
${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons4
- DEPS Public1 PRIVATE Private1 Private2 PUBLIC
Public2
- INCLUDE_INSTALL_DIR /usr/KCoreAddons
- FILENAME_VAR OutputFile)
-
-compare_files(GENERATED ${OutputFile}
- ORIGINALS ${origfiles})
-file(REMOVE ${OutputFile})
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/metainfo.yaml)
-
-message(STATUS "Test 6: with an URL parameter")
-set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF5CoreAddons5.pc")
-
-ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons5
- DESCRIPTION "KF5CoreAddons test"
- URL "https://www.example.org/";
- DEPS Qt5Core
- INCLUDE_INSTALL_DIR /usr/KCoreAddons
- FILENAME_VAR OutputFile)
-
-compare_files(GENERATED ${OutputFile}
- ORIGINALS ${origfiles})
-file(REMOVE ${OutputFile})
-
-message(STATUS "Test7: Custom defines")
-set(origfiles "${CMAKE_CURRENT_SOURCE_DIR}/KF6Attica.pc")
-set(prefix "/usr")
-
-ecm_setup_version(6.7.0 VARIABLE_PREFIX ATTICA
- VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/attica_version.h"
- PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF6AtticaConfigVersion.cmake"
- SOVERSION 6)
-
-ecm_generate_pkgconfig_file(BASE_NAME KF6Attica
- DESCRIPTION "Qt library to access Open
Collaboration Services"
- LIB_NAME KF6Attica
- INCLUDE_INSTALL_DIR /usr/include/Attica
- DEFINES -I\${prefix}/include/foo
-I\${prefix}/include/bar
- DEPS Qt6Core Qt6Network
- FILENAME_VAR OutputFile
- )
-
-compare_files(GENERATED ${OutputFile}
- ORIGINALS ${origfiles})
-file(REMOVE ${OutputFile})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/test-and-comparison-helpers.cmake
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/test-and-comparison-helpers.cmake
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/test-and-comparison-helpers.cmake
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/test-and-comparison-helpers.cmake
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,32 @@
+set(ECM_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../modules")
+set(CMAKE_MODULE_PATH "${ECM_MODULE_DIR}")
+
+set(CMAKE_INSTALL_PREFIX "/usr")
+
+function (compare_files)
+ set(options)
+ set(oneValueArgs GENERATED ORIGINALS)
+ set(multiValueArgs)
+ cmake_parse_arguments(CF "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
+ list(LENGTH CF_GENERATED count)
+ math(EXPR last "${count}-1")
+ foreach(i RANGE ${last})
+ list(GET CF_GENERATED ${i} generated_file)
+ if (NOT EXISTS "${generated_file}")
+ message(FATAL_ERROR "${generated_file} was not generated")
+ endif()
+ file(READ "${generated_file}" file_contents)
+ string(STRIP "${file_contents}" file_contents)
+
+ list(GET CF_ORIGINALS ${i} original_file)
+ if (NOT EXISTS "${original_file}")
+ message(FATAL_ERROR "Original ${original_file} was not found")
+ endif()
+ file(READ "${original_file}" original_contents)
+ string(STRIP "${original_contents}" original_contents)
+
+ if(NOT original_contents STREQUAL file_contents)
+ message(FATAL_ERROR "Different files: ${original_file}
${generated_file}")
+ endif()
+ endforeach()
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/with_an_URL_parameter/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/with_an_URL_parameter/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/with_an_URL_parameter/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/with_an_URL_parameter/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(with_an_URL_parameter VERSION 5.43)
+
+include(../test-and-comparison-helpers.cmake)
+
+include(ECMGeneratePkgConfigFile)
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT VARIABLE_PREFIX KCOREADDONS
+ VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake"
+ SOVERSION 5)
+
+set(origfiles
"${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/KF5CoreAddons5.pc")
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons5
+ DESCRIPTION "KF5CoreAddons test"
+ URL "https://www.example.org/";
+ DEPS Qt5Core
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/with_public_and_private_dependencies/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/with_public_and_private_dependencies/CMakeLists.txt
---
old/extra-cmake-modules-6.16.0/tests/ECMGeneratePkgConfigFile/with_public_and_private_dependencies/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-6.17.0/tests/ECMGeneratePkgConfigFile/with_public_and_private_dependencies/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(with_public_and_private_dependencies VERSION 5.43)
+
+include(../test-and-comparison-helpers.cmake)
+
+include(ECMGeneratePkgConfigFile)
+include(ECMSetupVersion)
+
+ecm_setup_version(PROJECT VARIABLE_PREFIX KCOREADDONS
+ VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5CoreAddonsConfigVersion.cmake"
+ SOVERSION 5)
+
+set(origfiles
"${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/KF5CoreAddons4.pc")
+
+file(COPY
${CMAKE_CURRENT_SOURCE_DIR}/../../../tests/ECMGeneratePkgConfigFile/metainfo_without_description.yaml
+ DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
+file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/metainfo_without_description.yaml
${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
+
+ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons4
+ DEPS Public1 PRIVATE Private1 Private2 PUBLIC
Public2
+ INCLUDE_INSTALL_DIR /usr/KCoreAddons
+ FILENAME_VAR OutputFile)
+
+compare_files(GENERATED ${OutputFile}
+ ORIGINALS ${origfiles})
+file(REMOVE ${OutputFile})
+file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/metainfo.yaml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-6.16.0/tests/ECMSetupVersionTest/CMakeLists.txt
new/extra-cmake-modules-6.17.0/tests/ECMSetupVersionTest/CMakeLists.txt
--- old/extra-cmake-modules-6.16.0/tests/ECMSetupVersionTest/CMakeLists.txt
2025-07-04 17:09:17.000000000 +0200
+++ new/extra-cmake-modules-6.17.0/tests/ECMSetupVersionTest/CMakeLists.txt
2025-08-01 12:28:40.000000000 +0200
@@ -13,16 +13,20 @@
--test-command ${COMMAND} ${ARGN})
endmacro()
-add_version_test(old_simple dummy)
-add_version_test(old_simple_no_version_string_vars dummy)
-add_version_test(old_soversion dummy)
-add_version_test(old_version_file dummy)
-add_version_test(old_version_file_abspath dummy)
-add_version_test(old_version_file_anynewer dummy)
-add_version_test(old_version_file_exact dummy)
-add_version_test(old_version_file_samemajor dummy)
-add_version_test(old_header check_header)
-add_version_test(old_header_abspath check_header)
+# Skip these tests with cmake >= 4 because CMP0048 doesn't exist anymore and
+# trying to set it results in a hard error.
+if(CMAKE_MAJOR_VERSION VERSION_LESS 4)
+ add_version_test(old_simple dummy)
+ add_version_test(old_simple_no_version_string_vars dummy)
+ add_version_test(old_soversion dummy)
+ add_version_test(old_version_file dummy)
+ add_version_test(old_version_file_abspath dummy)
+ add_version_test(old_version_file_anynewer dummy)
+ add_version_test(old_version_file_exact dummy)
+ add_version_test(old_version_file_samemajor dummy)
+ add_version_test(old_header check_header)
+ add_version_test(old_header_abspath check_header)
+endif()
add_version_test(new_explicit_header check_header)
add_version_test(new_explicit_header_abspath check_header)
