Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2019-10-14 13:32:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon Oct 14 13:32:50 2019 rev:70 rq:738000 version:5.63.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2019-09-23 12:21:34.293765916 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.2352/extra-cmake-modules.changes
2019-10-14 13:34:05.146557194 +0200
@@ -1,0 +2,12 @@
+Sun Oct 6 13:26:12 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.63.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.63.0.php
+- Changes since 5.62.0:
+ * new module ECMSourceVersionControl
+ * Fix FindEGL when using Emscripten
+ * ECMAddQch: add INCLUDE_DIRS argument
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.62.0.tar.xz
extra-cmake-modules-5.62.0.tar.xz.sig
New:
----
extra-cmake-modules-5.63.0.tar.xz
extra-cmake-modules-5.63.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.qbGcTk/_old 2019-10-14 13:34:06.334554097 +0200
+++ /var/tmp/diff_new_pack.qbGcTk/_new 2019-10-14 13:34:06.334554097 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.62
+%define _tar_path 5.63
# 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.62.0
+Version: 5.63.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
@@ -44,7 +44,7 @@
Patch0: bundle-lang.patch
BuildRequires: cmake >= 3.0
BuildRequires: gcc-c++
-BuildRequires: kf5-filesystem >= 5.6.0
+BuildRequires: kf5-filesystem
Requires: cmake >= 3.0
Requires: gcc-c++
Requires: kf5-filesystem
++++++ extra-cmake-modules-5.62.0.tar.xz -> extra-cmake-modules-5.63.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.62.0/CMakeLists.txt
new/extra-cmake-modules-5.63.0/CMakeLists.txt
--- old/extra-cmake-modules-5.62.0/CMakeLists.txt 2019-09-06
21:41:19.000000000 +0200
+++ new/extra-cmake-modules-5.63.0/CMakeLists.txt 2019-10-01
12:30:21.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.62.0") # handled by release scripts
+set(VERSION "5.63.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.62.0/docs/module/ECMSourceVersionControl.rst
new/extra-cmake-modules-5.63.0/docs/module/ECMSourceVersionControl.rst
--- old/extra-cmake-modules-5.62.0/docs/module/ECMSourceVersionControl.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.63.0/docs/module/ECMSourceVersionControl.rst
2019-10-01 12:30:21.000000000 +0200
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMSourceVersionControl.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.62.0/find-modules/FindEGL.cmake
new/extra-cmake-modules-5.63.0/find-modules/FindEGL.cmake
--- old/extra-cmake-modules-5.62.0/find-modules/FindEGL.cmake 2019-09-06
21:41:19.000000000 +0200
+++ new/extra-cmake-modules-5.63.0/find-modules/FindEGL.cmake 2019-10-01
12:30:21.000000000 +0200
@@ -129,25 +129,33 @@
cmake_pop_check_state()
+set(required_vars EGL_INCLUDE_DIR HAVE_EGL)
+if(NOT EMSCRIPTEN)
+ list(APPEND required_vars EGL_LIBRARY)
+endif()
+
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(EGL
FOUND_VAR
EGL_FOUND
REQUIRED_VARS
- EGL_LIBRARY
- EGL_INCLUDE_DIR
- HAVE_EGL
+ ${required_vars}
VERSION_VAR
EGL_VERSION
)
if(EGL_FOUND AND NOT TARGET EGL::EGL)
- add_library(EGL::EGL UNKNOWN IMPORTED)
- set_target_properties(EGL::EGL PROPERTIES
- IMPORTED_LOCATION "${EGL_LIBRARY}"
- INTERFACE_COMPILE_OPTIONS "${EGL_DEFINITIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${EGL_INCLUDE_DIR}"
- )
+ if (EMSCRIPTEN)
+ add_library(EGL::EGL INTERFACE IMPORTED)
+ # Nothing further to be done, system include paths have headers and
linkage is implicit.
+ else()
+ add_library(EGL::EGL UNKNOWN IMPORTED)
+ set_target_properties(EGL::EGL PROPERTIES
+ IMPORTED_LOCATION "${EGL_LIBRARY}"
+ INTERFACE_COMPILE_OPTIONS "${EGL_DEFINITIONS}"
+ INTERFACE_INCLUDE_DIRECTORIES "${EGL_INCLUDE_DIR}"
+ )
+ endif()
endif()
mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR HAVE_EGL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.62.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-5.63.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-5.62.0/kde-modules/KDECompilerSettings.cmake
2019-09-06 21:41:19.000000000 +0200
+++ new/extra-cmake-modules-5.63.0/kde-modules/KDECompilerSettings.cmake
2019-10-01 12:30:21.000000000 +0200
@@ -66,21 +66,21 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+include("${ECM_MODULE_DIR}/ECMSourceVersionControl.cmake")
+
############################################################
# Default build type
# If no build type was specified, default to using a debug build if the
# source directory is a git clone.
# Otherwise, leave it empty, to let distro packagers choose the flags.
############################################################
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
- set(default_build_type "Debug")
- message(STATUS "Setting build type to '${default_build_type}' as none
was specified.")
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY VALUE
"${default_build_type}")
- # Set the possible values of build type for cmake-gui
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
- "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
- endif()
+if (ECM_SOURCE_UNDER_VERSION_CONTROL AND NOT CMAKE_BUILD_TYPE AND NOT
CMAKE_CONFIGURATION_TYPES)
+ set(default_build_type "Debug")
+ message(STATUS "Setting build type to '${default_build_type}' as none was
specified.")
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY VALUE "${default_build_type}")
+ # Set the possible values of build type for cmake-gui
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+ "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()
############################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.62.0/modules/ECMAddQch.cmake
new/extra-cmake-modules-5.63.0/modules/ECMAddQch.cmake
--- old/extra-cmake-modules-5.62.0/modules/ECMAddQch.cmake 2019-09-06
21:41:19.000000000 +0200
+++ new/extra-cmake-modules-5.63.0/modules/ECMAddQch.cmake 2019-10-01
12:30:21.000000000 +0200
@@ -20,6 +20,7 @@
# [SOURCE_DIRS <dir> [<dir2> [...]]]
# [SOURCES <file> [<file2> [...]]]
# |MD_MAINPAGE <md_file>]
+# [INCLUDE_DIRS <incdir> [<incdir2> [...]]]
# [IMAGE_DIRS <idir> [<idir2> [...]]]
# [EXAMPLE_DIRS <edir> [<edir2> [...]]]
# [ORG_DOMAIN <domain>]
@@ -79,6 +80,9 @@
# page. This page will overrule any ``\mainpage`` command in the included
# sources.
#
+# INCLUDE_DIRS specifies the dirs which should be searched for included
+# headers. Dirs can be relative to the current source dir. Since 5.63.
+#
# IMAGE_DIRS specifies the dirs which contain images that are included in the
# documentation. Dirs can be relative to the current source dir.
#
@@ -403,7 +407,7 @@
# Parse arguments
set(options VERBOSE)
set(oneValueArgs NAME BASE_NAME QCH_INSTALL_DESTINATION
TAGFILE_INSTALL_DESTINATION COMPONENT VERSION NAMESPACE MD_MAINPAGE ORG_DOMAIN
CONFIG_TEMPLATE)
- set(multiValueArgs SOURCE_DIRS SOURCES IMAGE_DIRS EXAMPLE_DIRS
PREDEFINED_MACROS BLANK_MACROS LINK_QCHS)
+ set(multiValueArgs SOURCE_DIRS SOURCES INCLUDE_DIRS IMAGE_DIRS
EXAMPLE_DIRS PREDEFINED_MACROS BLANK_MACROS LINK_QCHS)
cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
# check required args
@@ -487,6 +491,14 @@
set(ECM_QCH_DOXYGEN_OUTPUTDIR "\"${_apidox_builddir}\"")
set(ECM_QCH_DOXYGEN_TAGFILE "\"${_tags_buildpath}\"")
set(ECM_QCH_DOXYGEN_LAYOUTFILE "\"${_doxygen_layout_file}\"")
+ set(ECM_QCH_DOXYGEN_INCLUDE_PATH)
+ foreach(_include_DIR IN LISTS ARGS_INCLUDE_DIRS)
+ if (NOT IS_ABSOLUTE ${_include_DIR})
+ set(_include_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${_include_DIR}")
+ endif()
+ # concat dirs separated by a break, it is no issue that first has
also a leading break
+ set(ECM_QCH_DOXYGEN_INCLUDE_PATH "${ECM_QCH_DOXYGEN_INCLUDE_PATH}
\\\n\"${_include_DIR}\"")
+ endforeach()
set(ECM_QCH_DOXYGEN_IMAGEDIRS)
foreach(_image_DIR IN LISTS ARGS_IMAGE_DIRS)
if (NOT IS_ABSOLUTE ${_image_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.62.0/modules/ECMQchDoxygen.config.in
new/extra-cmake-modules-5.63.0/modules/ECMQchDoxygen.config.in
--- old/extra-cmake-modules-5.62.0/modules/ECMQchDoxygen.config.in
2019-09-06 21:41:19.000000000 +0200
+++ new/extra-cmake-modules-5.63.0/modules/ECMQchDoxygen.config.in
2019-10-01 12:30:21.000000000 +0200
@@ -146,7 +146,7 @@
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
-INCLUDE_PATH =
+INCLUDE_PATH = @ECM_QCH_DOXYGEN_INCLUDE_PATH@
INCLUDE_FILE_PATTERNS =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.62.0/modules/ECMSetupVersion.cmake
new/extra-cmake-modules-5.63.0/modules/ECMSetupVersion.cmake
--- old/extra-cmake-modules-5.62.0/modules/ECMSetupVersion.cmake
2019-09-06 21:41:19.000000000 +0200
+++ new/extra-cmake-modules-5.63.0/modules/ECMSetupVersion.cmake
2019-10-01 12:30:21.000000000 +0200
@@ -28,7 +28,7 @@
# <prefix>_SOVERSION - <soversion>, or <major> if SOVERSION was not
given
#
# If CMake policy CMP0048 is not NEW, the following CMake variables will also
-# be set:
+# be set::
#
# PROJECT_VERSION_MAJOR - <major>
# PROJECT_VERSION_MINOR - <minor>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.62.0/modules/ECMSourceVersionControl.cmake
new/extra-cmake-modules-5.63.0/modules/ECMSourceVersionControl.cmake
--- old/extra-cmake-modules-5.62.0/modules/ECMSourceVersionControl.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.63.0/modules/ECMSourceVersionControl.cmake
2019-10-01 12:30:21.000000000 +0200
@@ -0,0 +1,46 @@
+#.rst:
+# ECMSourceVersionControl
+# --------------------------
+#
+# Tries to determine whether the source is under version control (git clone,
+# svn checkout, etc).
+#
+# ``ECM_SOURCE_UNDER_VERSION_CONTROL`` is set when indication is found that
+# CMAKE_SOURCE_DIR is under version control.
+#
+# Since 5.63
+
+#=============================================================================
+# Copyright 2019 Harald Sitter <[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.
+
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git" OR
+ EXISTS "${CMAKE_SOURCE_DIR}/.svn" OR
+ EXISTS "${CMAKE_SOURCE_DIR}/.hg" OR
+ EXISTS "${CMAKE_SOURCE_DIR}/.bzr")
+ set(ECM_SOURCE_UNDER_VERSION_CONTROL TRUE)
+else()
+ set(ECM_SOURCE_UNDER_VERSION_CONTROL FALSE)
+endif()
