Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2020-08-12 12:22:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Wed Aug 12 12:22:38 2020 rev:80 rq:825048 version:5.73.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2020-07-14 07:52:21.168441988 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.3399/extra-cmake-modules.changes
2020-08-12 12:24:00.844115415 +0200
@@ -1,0 +2,15 @@
+Sun Aug 2 07:13:00 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.73.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/kde-frameworks-5.73.0
+- Changes since 5.72.0:
+ * Fix inline literal formatting
+ * Fix reST list from not being a list
+ * fix license headers
+ * Add ecm_generate_dbus_service_file
+ * Introduce function ecm_install_configured_file
+ * Export Wayland_DATADIR
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.72.0.tar.xz
extra-cmake-modules-5.72.0.tar.xz.sig
New:
----
extra-cmake-modules-5.73.0.tar.xz
extra-cmake-modules-5.73.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.d3J1Iy/_old 2020-08-12 12:24:01.340115742 +0200
+++ /var/tmp/diff_new_pack.d3J1Iy/_new 2020-08-12 12:24:01.344115744 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.72
+%define _tar_path 5.73
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -29,7 +29,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: extra-cmake-modules
-Version: 5.72.0
+Version: 5.73.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.72.0.tar.xz -> extra-cmake-modules-5.73.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.72.0/CMakeLists.txt
new/extra-cmake-modules-5.73.0/CMakeLists.txt
--- old/extra-cmake-modules-5.72.0/CMakeLists.txt 2020-07-01
15:21:05.000000000 +0200
+++ new/extra-cmake-modules-5.73.0/CMakeLists.txt 2020-07-12
23:30:51.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.72.0") # handled by release scripts
+set(VERSION "5.73.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/docs/module/ECMConfiguredInstall.rst
new/extra-cmake-modules-5.73.0/docs/module/ECMConfiguredInstall.rst
--- old/extra-cmake-modules-5.72.0/docs/module/ECMConfiguredInstall.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.73.0/docs/module/ECMConfiguredInstall.rst
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMConfiguredInstall.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/docs/module/ECMGenerateDBusServiceFile.rst
new/extra-cmake-modules-5.73.0/docs/module/ECMGenerateDBusServiceFile.rst
--- old/extra-cmake-modules-5.72.0/docs/module/ECMGenerateDBusServiceFile.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.73.0/docs/module/ECMGenerateDBusServiceFile.rst
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMGenerateDBusServiceFile.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/find-modules/FindTaglib.cmake
new/extra-cmake-modules-5.73.0/find-modules/FindTaglib.cmake
--- old/extra-cmake-modules-5.72.0/find-modules/FindTaglib.cmake
2020-07-01 15:21:05.000000000 +0200
+++ new/extra-cmake-modules-5.73.0/find-modules/FindTaglib.cmake
2020-07-12 23:30:51.000000000 +0200
@@ -16,7 +16,7 @@
# ``Taglib_VERSION``
# The version of taglib that was found
#
-# If ``Taglib_FOUND is TRUE, it will also define the following imported
+# If ``Taglib_FOUND`` is TRUE, it will also define the following imported
# target:
#
# ``Taglib::Taglib``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/find-modules/FindWayland.cmake
new/extra-cmake-modules-5.73.0/find-modules/FindWayland.cmake
--- old/extra-cmake-modules-5.72.0/find-modules/FindWayland.cmake
2020-07-01 15:21:05.000000000 +0200
+++ new/extra-cmake-modules-5.73.0/find-modules/FindWayland.cmake
2020-07-12 23:30:51.000000000 +0200
@@ -32,6 +32,9 @@
# ``Wayland_DEFINITIONS``
# This should be passed to target_compile_options() if the targets are not
# used for linking
+# ``Wayland_DATADIR``
+# The core wayland protocols data directory
+# Since 5.73.0
#
# For each searched-for components, ``Wayland_<component>_FOUND`` will be set
to
# TRUE if the corresponding Wayland library was found, and FALSE otherwise. If
@@ -115,6 +118,8 @@
HANDLE_COMPONENTS
)
+pkg_get_variable(Wayland_DATADIR wayland-server pkgdatadir)
+
include(FeatureSummary)
set_package_properties(Wayland PROPERTIES
URL "https://wayland.freedesktop.org/";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/modules/ECMConfiguredInstall.cmake
new/extra-cmake-modules-5.73.0/modules/ECMConfiguredInstall.cmake
--- old/extra-cmake-modules-5.72.0/modules/ECMConfiguredInstall.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.73.0/modules/ECMConfiguredInstall.cmake
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,82 @@
+#.rst:
+# ECMConfiguredInstall
+# --------------------
+#
+# Takes a list of files, runs configure_file on each and installs the
resultant configured files in the given location.
+#
+# Any suffix of ".in" in the passed file names wil be stripped from the file
name at the installed location.
+#
+# ::
+#
+# ecm_install_configured_files(
+# INPUT <file> [<file2> [...]]
+# DESTINATION <INSTALL_DIRECTORY>
+# [COPYONLY]
+# [ESCAPE_QUOTES]
+# [@ONLY]
+# [COMPONENT <component>])
+#
+# Example usage:
+#
+# .. code-block:: cmake
+#
+# ecm_install_configured_files(INPUT foo.txt.in DESTINATION
${KDE_INSTALL_DATADIR} @ONLY)
+#
+# This wil install the file as foo.txt with any cmake variable replacements
made into the data directory.
+#
+# Since 5.73.0.
+
+#=============================================================================
+# SPDX-FileCopyrightText: 2020 David Edmundson <[email protected]>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#=============================================================================
+
+
+function(ecm_install_configured_files)
+ set(options COPYONLY ESCAPE_QUOTES @ONLY)
+ set(oneValueArgs DESTINATION COMPONENT)
+ set(multiValueArgs INPUT)
+
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}"
+ "${multiValueArgs}" ${ARGN})
+
+
+ if(ARGS_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unknown arguments given to
ecm_install_configured_file(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
+ endif()
+
+ if (NOT ARGS_DESTINATION)
+ message(FATAL_ERROR "missing DESTINATION argument to
ECMConfiguredInstall")
+ endif()
+
+ foreach(_input ${ARGS_INPUT})
+ # convert absolute paths
+ get_filename_component(_name ${_input} NAME)
+
+ string(REGEX REPLACE "\\.in$" "" _name ${_name})
+
+ set(_out_file ${CMAKE_CURRENT_BINARY_DIR}/${_name})
+
+ set(_configure_args)
+ if (ARGS_COPY_ONLY)
+ list(APPEND _configure_args COPY_ONLY)
+ endif()
+ if (ARGS_ESCAPE_QUOTES)
+ list(APPEND _configure_args ESCAPE_QUOTES)
+ endif()
+ if (ARGS_@ONLY)
+ list(APPEND _configure_args @ONLY)
+ endif()
+
+ configure_file(${_input} ${_out_file} ${_configure_args})
+
+ if (DEFINED ARGS_COMPONENT)
+ set(_component COMPONENT ${ARGS_COMPONENT})
+ else()
+ set(_component)
+ endif()
+
+ install(FILES ${_out_file} DESTINATION ${ARGS_DESTINATION}
${_component})
+ endforeach()
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/modules/ECMGenerateDBusServiceFile.cmake
new/extra-cmake-modules-5.73.0/modules/ECMGenerateDBusServiceFile.cmake
--- old/extra-cmake-modules-5.72.0/modules/ECMGenerateDBusServiceFile.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.73.0/modules/ECMGenerateDBusServiceFile.cmake
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,99 @@
+#.rst:
+# ECMGenerateDBusServiceFile
+# ---------------------------
+#
+# This module provides the ``ecm_generate_dbus_service_file`` function for
+# generating and installing a D-Bus service file.
+#
+# ::
+#
+# ecm_generate_dbus_service_file(
+# NAME <service name>
+# EXECUTABLE <executable>
+# [SYSTEMD_SERVICE <systemd service>]
+# DESTINATION <install_path>
+# )
+#
+# A D-Bus service file ``<service name>.service`` will be generated and
installed
+# in the relevant D-Bus config location.
+#
+# ``<executable>`` must be an absolute path to the installed service
executable. When using it with
+# ``KDEInstallDirs`` it needs to be the ``_FULL_`` variant of the path
variable.
+#
+# Note: On Windows, the macro will only use the file name part of
``<executable>`` since D-Bus
+# service executables are to be installed in the same directory as the D-Bus
daemon.
+#
+# Optionally, a ``<systemd service>`` can be specified to launch the
corresponding
+# systemd service instead of the ``<executable>`` if the D-Bus daemon is
started by systemd.
+#
+# Example usage:
+#
+# .. code-block:: cmake
+#
+# ecm_generate_dbus_service_file(
+# NAME org.kde.kded5
+# EXECUTABLE ${KDE_INSTALL_FULL_BINDIR}/kded5
+# DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
+# )
+#
+# .. code-block:: cmake
+#
+# ecm_generate_dbus_service_file(
+# NAME org.kde.kded5
+# EXECUTABLE ${KDE_INSTALL_FULL_BINDIR}/kded5
+# SYSTEMD_SERVICE plasma-kded.service
+# DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
+# )
+#
+# Since 5.73.0.
+
+#=============================================================================
+# SPDX-FileCopyrightText: 2020 Kai Uwe Broulik <[email protected]>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+include(CMakeParseArguments)
+
+function(ecm_generate_dbus_service_file)
+ set(options)
+ set(oneValueArgs EXECUTABLE NAME SYSTEMD_SERVICE DESTINATION)
+ set(multiValueArgs)
+ cmake_parse_arguments(ARG "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
+
+ if(ARG_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unexpected arguments to
ecm_generate_dbus_service_file: ${ARG_UNPARSED_ARGUMENTS}")
+ endif()
+ if(NOT ARG_NAME)
+ message(FATAL_ERROR "Missing NAME argument for
ecm_generate_dbus_service_file")
+ endif()
+ if(NOT ARG_EXECUTABLE)
+ message(FATAL_ERROR "Missing EXECUTABLE argument for
ecm_generate_dbus_service_file")
+ endif()
+ if(NOT ARG_DESTINATION)
+ message(FATAL_ERROR "Missing DESTINATION argument for
ecm_generate_dbus_service_file")
+ endif()
+
+ if(WIN32)
+ get_filename_component(_exec "${ARG_EXECUTABLE}" NAME)
+ else()
+ if (NOT IS_ABSOLUTE ${ARG_EXECUTABLE})
+ message(FATAL_ERROR "EXECUTABLE must be an absolute path in
ecm_generate_dbus_service_file")
+ else()
+ set(_exec ${ARG_EXECUTABLE})
+ endif()
+ endif()
+
+ set(_service_file ${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}.service)
+
+ file(WRITE ${_service_file}
+ "[D-BUS Service]
+Name=${ARG_NAME}
+Exec=${_exec}
+")
+
+ if (ARG_SYSTEMD_SERVICE)
+ file(APPEND ${_service_file} "SystemdService=${ARG_SYSTEMD_SERVICE}\n")
+ endif()
+
+ install(FILES ${_service_file} DESTINATION ${ARG_DESTINATION})
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/modules/ECMInstallIcons.cmake
new/extra-cmake-modules-5.73.0/modules/ECMInstallIcons.cmake
--- old/extra-cmake-modules-5.72.0/modules/ECMInstallIcons.cmake
2020-07-01 15:21:05.000000000 +0200
+++ new/extra-cmake-modules-5.73.0/modules/ECMInstallIcons.cmake
2020-07-12 23:30:51.000000000 +0200
@@ -51,11 +51,12 @@
# <theme><size>-<group>-<name>.<ext>
#
# where ``<theme>`` is one of
-# * ``hi`` for hicolor
-# * ``lo`` for locolor
-# * ``cr`` for the Crystal icon theme
-# * ``ox`` for the Oxygen icon theme
-# * ``br`` for the Breeze icon theme
+#
+# * ``hi`` for hicolor
+# * ``lo`` for locolor
+# * ``cr`` for the Crystal icon theme
+# * ``ox`` for the Oxygen icon theme
+# * ``br`` for the Breeze icon theme
#
# With this syntax, the file ``hi22-actions-menu_new.png`` would be installed
# into ``<icon_install_dir>/hicolor/22x22/actions/menu_new.png``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.72.0/tests/CMakeLists.txt
new/extra-cmake-modules-5.73.0/tests/CMakeLists.txt
--- old/extra-cmake-modules-5.72.0/tests/CMakeLists.txt 2020-07-01
15:21:05.000000000 +0200
+++ new/extra-cmake-modules-5.73.0/tests/CMakeLists.txt 2020-07-12
23:30:51.000000000 +0200
@@ -201,3 +201,21 @@
if (TARGET Qt5::Quick)
add_test_macro(ECMQMLModules dummy)
endif()
+
+set(ECMConfiguredInstallTest_EXTRA_OPTIONS
+ --build-target install
+ --build-options
+
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/ECMConfiguredInstallTest/InstallDirectory"
+)
+add_test_macro(ECMConfiguredInstallTest
+ ${CMAKE_COMMAND} -P
"${CMAKE_CURRENT_BINARY_DIR}/ECMConfiguredInstallTest/check_tree.cmake"
+)
+
+set(ECMGenerateDBusServiceFileTest_EXTRA_OPTIONS
+ --build-target install
+ --build-options
+
"-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/ECMGenerateDBusServiceFileTest/InstallDirectory"
+)
+add_test_macro(ECMGenerateDBusServiceFileTest
+ ${CMAKE_COMMAND} -P
"${CMAKE_CURRENT_BINARY_DIR}/ECMGenerateDBusServiceFileTest/check_tree.cmake"
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/CMakeLists.txt
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/CMakeLists.txt
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/CMakeLists.txt
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.5)
+project(ECMConfiguredInstallTest)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
+
+# make sure the test install dir is clean
+file(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}")
+include(ECMConfiguredInstall)
+
+# run test
+
+set(FOO myFoo)
+set(BAR myBar)
+
+ecm_install_configured_files(INPUT configured.txt DESTINATION
${CMAKE_INSTALL_PREFIX}/test)
+
+ecm_install_configured_files(INPUT configured_atOnly.txt.in DESTINATION
${CMAKE_INSTALL_PREFIX}/test @ONLY ESCAPE_QUOTES)
+
+ecm_install_configured_files(INPUT multi1.txt.in
${CMAKE_CURRENT_SOURCE_DIR}/multi2.txt.in DESTINATION
${CMAKE_INSTALL_PREFIX}/test)
+
+# this will be run by CTest
+configure_file(check_tree.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/check_tree.cmake" @ONLY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/check_tree.cmake.in
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/check_tree.cmake.in
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/check_tree.cmake.in
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/check_tree.cmake.in
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,20 @@
+set(EXPECTED "@CMAKE_CURRENT_SOURCE_DIR@/expected")
+set(ACTUAL "@CMAKE_INSTALL_PREFIX@")
+
+# Compares files in two directories, emits a fatal error if the top level
files are different
+# Takes a directory of expected files, and a directory of output files
+function(compare_dirs expected output )
+ file(GLOB files "${expected}/*")
+ foreach(file ${files})
+ get_filename_component(name ${file} NAME)
+
+ execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files ${file}
"${output}/${name}"
+ RESULT_VARIABLE test_result
+ )
+ If (NOT test_result EQUAL 0)
+ message(FATAL_ERROR "Test failed: ${file} doesn't match
${output}/${name}!")
+ endif()
+ endforeach()
+endfunction()
+
+compare_dirs(${EXPECTED} ${ACTUAL}/test )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/configured.txt
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/configured.txt
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/configured.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/configured.txt
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,3 @@
+[General]
+Foo=@FOO@
+Bar=${BAR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/configured_atOnly.txt.in
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/configured_atOnly.txt.in
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/configured_atOnly.txt.in
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/configured_atOnly.txt.in
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,3 @@
+[General]
+Foo=@FOO@
+Bar=${BAR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/configured.txt
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/configured.txt
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/configured.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/configured.txt
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,3 @@
+[General]
+Foo=myFoo
+Bar=myBar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/configured_atOnly.txt
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/configured_atOnly.txt
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/configured_atOnly.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/configured_atOnly.txt
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,3 @@
+[General]
+Foo=myFoo
+Bar=${BAR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/multi1.txt
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/multi1.txt
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/multi1.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/multi1.txt
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,2 @@
+TestMulti1
+Foo=myFoo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/multi2.txt
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/multi2.txt
---
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/expected/multi2.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/expected/multi2.txt
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,2 @@
+TestMulti2
+Foo=myFoo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/multi1.txt.in
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/multi1.txt.in
--- old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/multi1.txt.in
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/multi1.txt.in
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,2 @@
+TestMulti1
+Foo=@FOO@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/multi2.txt.in
new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/multi2.txt.in
--- old/extra-cmake-modules-5.72.0/tests/ECMConfiguredInstallTest/multi2.txt.in
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.73.0/tests/ECMConfiguredInstallTest/multi2.txt.in
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,2 @@
+TestMulti2
+Foo=@FOO@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/CMakeLists.txt
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/CMakeLists.txt
---
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/CMakeLists.txt
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.5)
+project(ECMGenerateDBusServiceFileTest)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules)
+
+# make sure the test install dir is clean
+file(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}")
+include(ECMGenerateDBusServiceFile)
+
+# run test
+
+ecm_generate_dbus_service_file(
+ NAME org.kde.kded5
+ EXECUTABLE /usr/bin/kded5
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/test
+)
+
+ecm_generate_dbus_service_file(
+ NAME org.kde.kded5.withSystemD
+ EXECUTABLE /usr/bin/kded5
+ SYSTEMD_SERVICE plasma-kded.service
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/test
+)
+
+# this will be run by CTest
+configure_file(check_tree.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/check_tree.cmake" @ONLY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in
---
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/check_tree.cmake.in
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,20 @@
+set(EXPECTED "@CMAKE_CURRENT_SOURCE_DIR@/expected")
+set(ACTUAL "@CMAKE_INSTALL_PREFIX@")
+
+# Compares files in two directories, emits a fatal error if the top level
files are different
+# Takes a directory of expected files, and a directory of output files
+function(compare_dirs expected output )
+ file(GLOB files "${expected}/*")
+ foreach(file ${files})
+ get_filename_component(name ${file} NAME)
+
+ execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files ${file}
"${output}/${name}"
+ RESULT_VARIABLE test_result
+ )
+ If (NOT test_result EQUAL 0)
+ message(FATAL_ERROR "Test failed: ${file} doesn't match
${output}/${name}!")
+ endif()
+ endforeach()
+endfunction()
+
+compare_dirs(${EXPECTED} ${ACTUAL}/test )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.service
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.service
---
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.service
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.service
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.kde.kded5
+Exec=/usr/bin/kded5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.withSystemD.service
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.withSystemD.service
---
old/extra-cmake-modules-5.72.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.withSystemD.service
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.73.0/tests/ECMGenerateDBusServiceFileTest/expected/org.kde.kded5.withSystemD.service
2020-07-12 23:30:51.000000000 +0200
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.kde.kded5.withSystemD
+Exec=/usr/bin/kded5
+SystemdService=plasma-kded.service
