Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2019-04-19 21:20:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Fri Apr 19 21:20:30 2019 rev:64 rq:695195 version:5.57.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2019-03-21 09:44:13.698926182 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.5536/extra-cmake-modules.changes
2019-04-19 21:21:56.563687665 +0200
@@ -1,0 +2,18 @@
+Sun Apr 14 20:21:41 UTC 2019 - [email protected]
+
+- Update to 5.57.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.57.0.php
+- Changes since 5.56.0:
+ * Re-enable the setting of QT_PLUGIN_PATH, without the strange backslash.
+ * ecm_add_wayland_client_protocol: Improve error messages
+ * ECMGeneratePkgConfigFile: make all vars dependent on ${prefix}
+ * Add UDev find module
+ * Fix harmless warnings when creating the doc.
+ * Also ignore __pycache__
+ * ECMGeneratePkgConfigFile: add variables used by pkg_check_modules
+ * Restore FindFontconfig backward compatibility for plasma-desktop
+ * Add Fontconfig find module
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.56.0.tar.xz
New:
----
extra-cmake-modules-5.57.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.U9nc9N/_old 2019-04-19 21:21:57.971689459 +0200
+++ /var/tmp/diff_new_pack.U9nc9N/_new 2019-04-19 21:21:58.015689514 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.56
+%define _tar_path 5.57
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -27,7 +27,7 @@
%bcond_with doc
%endif
Name: extra-cmake-modules
-Version: 5.56.0
+Version: 5.57.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.56.0.tar.xz -> extra-cmake-modules-5.57.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.56.0/.gitignore
new/extra-cmake-modules-5.57.0/.gitignore
--- old/extra-cmake-modules-5.56.0/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/extra-cmake-modules-5.57.0/.gitignore 2019-03-31 20:30:16.000000000
+0200
@@ -0,0 +1,22 @@
+# Ignore the following files
+*~
+*.[oa]
+*.diff
+*.kate-swp
+*.kdev4
+.kdev_include_paths
+*.kdevelop.pcs
+*.moc
+*.moc.cpp
+*.orig
+*.user
+.*.swp
+.swp.*
+Doxyfile
+Makefile
+avail
+random_seed
+/build*/
+CMakeLists.txt.user*
+*.unc-backup*
+__pycache__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.56.0/CMakeLists.txt
new/extra-cmake-modules-5.57.0/CMakeLists.txt
--- old/extra-cmake-modules-5.56.0/CMakeLists.txt 2019-02-26
23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/CMakeLists.txt 2019-03-31
20:30:16.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.56.0") # handled by release scripts
+set(VERSION "5.57.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.56.0/attic/modules/FindFontconfig.cmake
new/extra-cmake-modules-5.57.0/attic/modules/FindFontconfig.cmake
--- old/extra-cmake-modules-5.56.0/attic/modules/FindFontconfig.cmake
2019-02-26 23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/attic/modules/FindFontconfig.cmake
1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-# - Try to find the Fontconfig
-# Once done this will define
-#
-# FONTCONFIG_FOUND - system has Fontconfig
-# FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig
headers
-# FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG
-# FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG
-
-# Copyright (c) 2006,2007 Laurent Montel, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
-
- # in cache already
- set(FONTCONFIG_FOUND TRUE)
-
-else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
-
- if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
-
- set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
- endif (NOT WIN32)
-
- find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
- PATHS
- ${PC_FONTCONFIG_INCLUDEDIR}
- ${PC_FONTCONFIG_INCLUDE_DIRS}
- /usr/X11/include
- )
-
- find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
- PATHS
- ${PC_FONTCONFIG_LIBDIR}
- ${PC_FONTCONFIG_LIBRARY_DIRS}
- )
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Fontconfig DEFAULT_MSG
FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR )
-
- mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
-
-endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/attic/modules/FindUDev.cmake
new/extra-cmake-modules-5.57.0/attic/modules/FindUDev.cmake
--- old/extra-cmake-modules-5.56.0/attic/modules/FindUDev.cmake 2019-02-26
23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/attic/modules/FindUDev.cmake 1970-01-01
01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-# - Try to find UDev
-# Once done this will define
-#
-# UDEV_FOUND - system has UDev
-# UDEV_INCLUDE_DIR - the libudev include directory
-# UDEV_LIBS - The libudev libraries
-
-# Copyright (c) 2010, Rafael Fernández López, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-find_path(UDEV_INCLUDE_DIR libudev.h)
-find_library(UDEV_LIBS udev)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(UDev DEFAULT_MSG UDEV_INCLUDE_DIR UDEV_LIBS)
-
-mark_as_advanced(UDEV_INCLUDE_DIR UDEV_LIBS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/docs/find-module/FindFontconfig.rst
new/extra-cmake-modules-5.57.0/docs/find-module/FindFontconfig.rst
--- old/extra-cmake-modules-5.56.0/docs/find-module/FindFontconfig.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/docs/find-module/FindFontconfig.rst
2019-03-31 20:30:16.000000000 +0200
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindFontconfig.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/docs/find-module/FindUDev.rst
new/extra-cmake-modules-5.57.0/docs/find-module/FindUDev.rst
--- old/extra-cmake-modules-5.56.0/docs/find-module/FindUDev.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/docs/find-module/FindUDev.rst
2019-03-31 20:30:16.000000000 +0200
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindUDev.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/find-modules/FindCanberra.cmake
new/extra-cmake-modules-5.57.0/find-modules/FindCanberra.cmake
--- old/extra-cmake-modules-5.56.0/find-modules/FindCanberra.cmake
2019-02-26 23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/find-modules/FindCanberra.cmake
2019-03-31 20:30:16.000000000 +0200
@@ -1,6 +1,6 @@
#.rst:
# FindCanberra
-# -------
+# ------------
#
# Try to find Canberra event sound library.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/find-modules/FindFontconfig.cmake
new/extra-cmake-modules-5.57.0/find-modules/FindFontconfig.cmake
--- old/extra-cmake-modules-5.56.0/find-modules/FindFontconfig.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/find-modules/FindFontconfig.cmake
2019-03-31 20:30:16.000000000 +0200
@@ -0,0 +1,118 @@
+#.rst:
+# FindFontconfig
+# --------------
+#
+# Try to find Fontconfig.
+# Once done this will define the following variables:
+#
+# ``Fontconfig_FOUND``
+# True if Fontconfig is available
+# ``Fontconfig_INCLUDE_DIRS``
+# The include directory to use for the Fontconfig headers
+# ``Fontconfig_LIBRARIES``
+# The Fontconfig libraries for linking
+# ``Fontconfig_DEFINITIONS``
+# Compiler switches required for using Fontconfig
+# ``Fontconfig_VERSION``
+# The version of Fontconfig that has been found
+#
+# If ``Fontconfig_FOUND`` is True, it will also define the following
+# imported target:
+#
+# ``Fontconfig::Fontconfig``
+#
+# Since 5.57.0.
+
+#=============================================================================
+# Copyright (c) 2006,2007 Laurent Montel, <[email protected]>
+# Copyright (c) 2018 Volker Krause <[email protected]>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
+
+set(Fontconfig_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
+
+find_path(Fontconfig_INCLUDE_DIRS fontconfig/fontconfig.h
+ PATHS
+ ${PC_FONTCONFIG_INCLUDE_DIRS}
+ /usr/X11/include
+)
+
+find_library(Fontconfig_LIBRARIES NAMES fontconfig
+ PATHS
+ ${PC_FONTCONFIG_LIBRARY_DIRS}
+)
+
+set(Fontconfig_VERSION ${PC_FONTCONFIG_VERSION})
+if (NOT Fontconfig_VERSION)
+ find_file(Fontconfig_VERSION_HEADER
+ NAMES "fontconfig/fontconfig.h"
+ HINTS ${Fontconfig_INCLUDE_DIRS}
+ )
+ mark_as_advanced(Fontconfig_VERSION_HEADER)
+ if (Fontconfig_VERSION_HEADER)
+ file(READ ${Fontconfig_VERSION_HEADER}
_fontconfig_version_header_content)
+ string(REGEX MATCH "#define FC_MAJOR[ \t]+[0-9]+"
Fontconfig_MAJOR_VERSION_MATCH ${_fontconfig_version_header_content})
+ string(REGEX MATCH "#define FC_MINOR[ \t]+[0-9]+"
Fontconfig_MINOR_VERSION_MATCH ${_fontconfig_version_header_content})
+ string(REGEX MATCH "#define FC_REVISION[ \t]+[0-9]+"
Fontconfig_PATCH_VERSION_MATCH ${_fontconfig_version_header_content})
+ string(REGEX REPLACE ".*FC_MAJOR[ \t]+(.*)" "\\1"
Fontconfig_MAJOR_VERSION ${Fontconfig_MAJOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*FC_MINOR[ \t]+(.*)" "\\1"
Fontconfig_MINOR_VERSION ${Fontconfig_MINOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*FC_REVISION[ \t]+(.*)" "\\1"
Fontconfig_PATCH_VERSION ${Fontconfig_PATCH_VERSION_MATCH})
+ set(Fontconfig_VERSION
"${Fontconfig_MAJOR_VERSION}.${Fontconfig_MINOR_VERSION}.${Fontconfig_PATCH_VERSION}")
+ endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Fontconfig
+ FOUND_VAR Fontconfig_FOUND
+ REQUIRED_VARS Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS
+ VERSION_VAR Fontconfig_VERSION
+)
+mark_as_advanced(Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS)
+
+if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig)
+ add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED)
+ set_target_properties(Fontconfig::Fontconfig PROPERTIES
+ IMPORTED_LOCATION "${Fontconfig_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIRS}"
+ INTERFACE_COMPILER_DEFINITIONS "${Fontconfig_DEFINITIONS}"
+ )
+endif()
+
+# backward compatibility, remove in kf6
+set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}")
+set(FONTCONFIG_LIBRARIES "${Fontconfig_LIBRARIES}")
+set(FONTCONFIG_DEFINITIONS "${Fontconfig_DEFINITIONS}")
+mark_as_advanced(FONTCONFIG_INCLUDE_DIR FONTCONFIG_LIBRARIES
FONTCONFIG_DEFINITIONS)
+
+include(FeatureSummary)
+set_package_properties(Fontconfig PROPERTIES
+ URL "https://www.fontconfig.org/";
+ DESCRIPTION "Fontconfig is a library for configuring and customizing font
access"
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/find-modules/FindUDev.cmake
new/extra-cmake-modules-5.57.0/find-modules/FindUDev.cmake
--- old/extra-cmake-modules-5.56.0/find-modules/FindUDev.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/find-modules/FindUDev.cmake 2019-03-31
20:30:16.000000000 +0200
@@ -0,0 +1,92 @@
+#.rst:
+# FindUDev
+# --------
+#
+# Try to find the UDev library, once done this will define:
+#
+# ``UDev_FOUND``
+# System has UDev.
+#
+# ``UDev_INCLUDE_DIRS``
+# The libudev include directory.
+#
+# ``UDev_LIBRARIES``
+# The libudev libraries.
+#
+# ``UDev_VERSION``
+# The libudev version.
+#
+# If ``UDev_FOUND`` is TRUE, the following imported target
+# will be available:
+#
+# ``UDev::UDev``
+# The UDev library
+#
+# Since 5.57.0.
+
+#=============================================================================
+# Copyright (c) 2010, Rafael Fernández López, <[email protected]>
+# Copyright (c) 2019, Volker Krause, <[email protected]>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#=============================================================================
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_UDEV QUIET libudev)
+
+find_path(UDev_INCLUDE_DIRS NAMES libudev.h HINTS ${PC_UDEV_INCLUDE_DIRS})
+find_library(UDev_LIBRARIES NAMES udev HINTS ${PC_UDEV_LIBRARY_DIRS})
+
+set(UDev_VERSION ${PC_UDEV_VERSION})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(UDev
+ FOUND_VAR UDev_FOUND
+ REQUIRED_VARS UDev_INCLUDE_DIRS UDev_LIBRARIES
+ VERSION_VAR UDev_VERSION
+)
+
+mark_as_advanced(UDev_INCLUDE_DIRS UDev_LIBRARIES)
+
+if(UDev_FOUND AND NOT TARGET UDev::UDev)
+ add_library(UDev::UDev UNKNOWN IMPORTED)
+ set_target_properties(UDev::UDev PROPERTIES
+ IMPORTED_LOCATION "${UDev_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${UDev_INCLUDE_DIRS}"
+ INTERFACE_COMPILE_DEFINITIONS "${PC_UDEV_CFLAGS_OTHER}"
+ )
+endif()
+
+# backward compat variables, remove for KF6
+set(UDEV_FOUND ${UDev_FOUND})
+set(UDEV_LIBS ${UDev_LIBRARIES})
+set(UDEV_INCLUDE_DIR ${UDev_INCLUDE_DIRS})
+mark_as_advanced(UDEV_FOUND UDEV_LIBS UDEV_INCLUDE_DIR)
+
+include(FeatureSummary)
+set_package_properties(UDev PROPERTIES
+ DESCRIPTION "API for enumerating and introspecting local devices (part of
systemd)"
+ URL "https://freedesktop.org/wiki/Software/systemd/";
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/find-modules/FindWaylandScanner.cmake
new/extra-cmake-modules-5.57.0/find-modules/FindWaylandScanner.cmake
--- old/extra-cmake-modules-5.56.0/find-modules/FindWaylandScanner.cmake
2019-02-26 23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/find-modules/FindWaylandScanner.cmake
2019-03-31 20:30:16.000000000 +0200
@@ -128,11 +128,11 @@
set_property(SOURCE ${_client_header} PROPERTY SKIP_AUTOMOC ON)
add_custom_command(OUTPUT "${_client_header}"
- COMMAND ${WaylandScanner_EXECUTABLE} client-header < ${_infile} >
${_client_header}
+ COMMAND ${WaylandScanner_EXECUTABLE} client-header ${_infile}
${_client_header}
DEPENDS ${_infile} VERBATIM)
add_custom_command(OUTPUT "${_code}"
- COMMAND ${WaylandScanner_EXECUTABLE} code < ${_infile} > ${_code}
+ COMMAND ${WaylandScanner_EXECUTABLE} code ${_infile} ${_code}
DEPENDS ${_infile} ${_client_header} VERBATIM)
list(APPEND ${out_var} "${_client_header}" "${_code}")
@@ -159,7 +159,7 @@
set_source_files_properties(${_server_header} GENERATED)
add_custom_command(OUTPUT "${_server_header}"
- COMMAND ${WaylandScanner_EXECUTABLE} server-header < ${_infile} >
${_server_header}
+ COMMAND ${WaylandScanner_EXECUTABLE} server-header ${_infile}
${_server_header}
DEPENDS ${_infile} VERBATIM)
list(APPEND ${out_var} "${_server_header}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.56.0/modules/ECMAddTests.cmake
new/extra-cmake-modules-5.57.0/modules/ECMAddTests.cmake
--- old/extra-cmake-modules-5.56.0/modules/ECMAddTests.cmake 2019-02-26
23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/modules/ECMAddTests.cmake 2019-03-31
20:30:16.000000000 +0200
@@ -114,15 +114,15 @@
add_test(NAME ${_testname} COMMAND ${_targetname})
target_link_libraries(${_targetname} ${ARG_LINK_LIBRARIES})
ecm_mark_as_test(${_targetname})
- #if (CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- # if(CMAKE_HOST_SYSTEM MATCHES "Windows")
- # set(PATHSEP "\\;")
- # else() # e.g. Linux
- # set(PATHSEP ":")
- # endif()
- # set(_plugin_path $ENV{QT_PLUGIN_PATH})
- # set_property(TEST ${_testname} PROPERTY ENVIRONMENT
QT_PLUGIN_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}${_plugin_path})
- #endif()
+ if (CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+ if(CMAKE_HOST_SYSTEM MATCHES "Windows")
+ set(PATHSEP ";")
+ else() # e.g. Linux
+ set(PATHSEP ":")
+ endif()
+ set(_plugin_path $ENV{QT_PLUGIN_PATH})
+ set_property(TEST ${_testname} PROPERTY ENVIRONMENT
QT_PLUGIN_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}${_plugin_path})
+ endif()
if (ARG_TARGET_NAME_VAR)
set(${ARG_TARGET_NAME_VAR} "${_targetname}" PARENT_SCOPE)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/modules/ECMGeneratePkgConfigFile.cmake
new/extra-cmake-modules-5.57.0/modules/ECMGeneratePkgConfigFile.cmake
--- old/extra-cmake-modules-5.56.0/modules/ECMGeneratePkgConfigFile.cmake
2019-02-26 23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/modules/ECMGeneratePkgConfigFile.cmake
2019-03-31 20:30:16.000000000 +0200
@@ -156,14 +156,14 @@
string(REPLACE ";" " " PKGCONFIG_TARGET_DEPS "${EGPF_DEPS}")
endif ()
if(IS_ABSOLUTE "${EGPF_INCLUDE_INSTALL_DIR}")
- set(PKGCONFIG_TARGET_INCLUDES "-I${EGPF_INCLUDE_INSTALL_DIR}")
+ set(PKGCONFIG_TARGET_INCLUDES "${EGPF_INCLUDE_INSTALL_DIR}")
else()
- set(PKGCONFIG_TARGET_INCLUDES
"-I${CMAKE_INSTALL_PREFIX}/${EGPF_INCLUDE_INSTALL_DIR}")
+ set(PKGCONFIG_TARGET_INCLUDES "\${prefix}/${EGPF_INCLUDE_INSTALL_DIR}")
endif()
if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}")
set(PKGCONFIG_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}")
else()
- set(PKGCONFIG_TARGET_LIBS
"${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}")
+ set(PKGCONFIG_TARGET_LIBS "\${prefix}/${EGPF_LIB_INSTALL_DIR}")
endif()
set(PKGCONFIG_TARGET_DESCRIPTION "${EGPF_DESCRIPTION}")
set(PKGCONFIG_TARGET_DEFINES "")
@@ -178,11 +178,16 @@
file(WRITE ${PKGCONFIG_FILENAME}
"
+prefix=${CMAKE_INSTALL_PREFIX}
+exec_prefix=\${prefix}
+libdir=\${prefix}/${EGPF_LIB_INSTALL_DIR}
+includedir=${PKGCONFIG_TARGET_INCLUDES}
+
Name: ${PKGCONFIG_TARGET_LIBNAME}
Description: ${PKGCONFIG_TARGET_DESCRIPTION}
Version: ${PROJECT_VERSION}
-Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}
-l${PKGCONFIG_TARGET_LIBNAME}
-Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES}
+Libs: -L\${prefix}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME}
+Cflags: -I${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES}
Requires: ${PKGCONFIG_TARGET_DEPS}
"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/modules/ECMSetupQtPluginMacroNames.cmake
new/extra-cmake-modules-5.57.0/modules/ECMSetupQtPluginMacroNames.cmake
--- old/extra-cmake-modules-5.56.0/modules/ECMSetupQtPluginMacroNames.cmake
2019-02-26 23:04:32.000000000 +0100
+++ new/extra-cmake-modules-5.57.0/modules/ECMSetupQtPluginMacroNames.cmake
2019-03-31 20:30:16.000000000 +0200
@@ -1,6 +1,6 @@
#.rst:
# ECMSetupQtPluginMacroNames
-# ---------------
+# --------------------------
#
# Instruct CMake's automoc about C++ preprocessor macros used to define
Qt-style plugins.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
---
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
2019-02-26 23:04:32.000000000 +0100
+++
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc
2019-03-31 20:30:16.000000000 +0200
@@ -1,7 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/KF5CoreAddons
+
Name: KF5CoreAddons
Description: KF5CoreAddons test
Version: 5.43
-Libs: -L/usr/lib -lKF5CoreAddons
-Cflags: -I/usr/KCoreAddons
+Libs: -L${prefix}/lib -lKF5CoreAddons
+Cflags: -I${prefix}/include/KF5CoreAddons
Requires: Qt5Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
---
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
2019-02-26 23:04:32.000000000 +0100
+++
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc
2019-03-31 20:30:16.000000000 +0200
@@ -1,7 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=/usr/KCoreAddons
+
Name: KF5CoreAddons2
Description: Addons to QtCore
Version: 5.43
-Libs: -L/usr/lib -lKF5CoreAddons2
+Libs: -L${prefix}/lib -lKF5CoreAddons2
Cflags: -I/usr/KCoreAddons
Requires: Qt5Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
---
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
2019-02-26 23:04:32.000000000 +0100
+++
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc
2019-03-31 20:30:16.000000000 +0200
@@ -1,7 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=/usr/KCoreAddons
+
Name: KF5CoreAddons3
Description: KF5CoreAddons3 library.
Version: 5.43
-Libs: -L/usr/lib -lKF5CoreAddons3
+Libs: -L${prefix}/lib -lKF5CoreAddons3
Cflags: -I/usr/KCoreAddons
Requires: Qt5Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
---
old/extra-cmake-modules-5.56.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
2019-02-26 23:04:32.000000000 +0100
+++
new/extra-cmake-modules-5.57.0/tests/ECMGeneratePkgConfigFile/run_test.cmake.config
2019-03-31 20:30:16.000000000 +0200
@@ -51,7 +51,6 @@
ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons
DESCRIPTION "KF5CoreAddons test"
DEPS Qt5Core
- INCLUDE_INSTALL_DIR /usr/KCoreAddons
FILENAME_VAR OutputFile)
compare_files(GENERATED ${OutputFile}
