Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2020-03-19 19:41:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Thu Mar 19 19:41:28 2020 rev:75 rq:785293 version:5.68.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2020-02-14 16:32:23.571419218 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.3160/extra-cmake-modules.changes
2020-03-19 19:43:27.895958088 +0100
@@ -1,0 +2,14 @@
+Sun Mar 8 09:17:32 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.68.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.68.0.php
+- Changes since 5.67.0:
+ * Support NDK r20 and Qt 5.14
+ * Load QM files from assets: URLs on Android
+ * Add ecm_qt_install_logging_categories & ecm_qt_export_logging_category
+ * ECMGeneratePriFile: unbreak for usages with LIB_NAME not a target name
+ * ECMGeneratePriFile: Fix static configurations
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.67.0.tar.xz
extra-cmake-modules-5.67.0.tar.xz.sig
New:
----
extra-cmake-modules-5.68.0.tar.xz
extra-cmake-modules-5.68.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.9zHapv/_old 2020-03-19 19:43:29.055958762 +0100
+++ /var/tmp/diff_new_pack.9zHapv/_new 2020-03-19 19:43:29.067958769 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.67
+%define _tar_path 5.68
# 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.67.0
+Version: 5.68.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ bundle-lang.patch ++++++
--- /var/tmp/diff_new_pack.9zHapv/_old 2020-03-19 19:43:29.095958786 +0100
+++ /var/tmp/diff_new_pack.9zHapv/_new 2020-03-19 19:43:29.095958786 +0100
@@ -9,29 +9,29 @@
modules/ECMQmLoader.cpp.in | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
-Index:
extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1/modules/ECMQmLoader.cpp.in
+Index:
extra-cmake-modules-5.56.0git.20200226T180944~040504d/modules/ECMQmLoader.cpp.in
===================================================================
----
extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1.orig/modules/ECMQmLoader.cpp.in
-+++
extra-cmake-modules-5.50.0git.20181015T134434~72aa6e1/modules/ECMQmLoader.cpp.in
-@@ -44,14 +44,18 @@ namespace {
+---
extra-cmake-modules-5.56.0git.20200226T180944~040504d.orig/modules/ECMQmLoader.cpp.in
2020-02-27 07:10:58.979815190 +0100
++++
extra-cmake-modules-5.56.0git.20200226T180944~040504d/modules/ECMQmLoader.cpp.in
2020-02-27 07:13:15.674038108 +0100
+@@ -44,15 +44,19 @@
QString subPath = QStringLiteral("locale/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@[email protected]");
#if defined(Q_OS_ANDROID)
-- const QString fullPath = QDir::homePath() +
QStringLiteral("/../qt-reserved-files/share/") + subPath;
-+ QString fullPath = QDir::homePath() +
QStringLiteral("/../qt-reserved-files/share/") + subPath;
+- const QString fullPath = QStringLiteral("assets:/share/") + subPath;
++ QString fullPath = QStringLiteral("assets:/share/") + subPath;
if (!QFile::exists(fullPath)) {
return false;
}
#else
- const QString fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
+ QString fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
- if (fullPath.isEmpty()) {
-- return false;
++ if (fullPath.isEmpty()) {
+ subPath = QStringLiteral("locale-bundle/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@[email protected]");
+ fullPath =
QStandardPaths::locate(QStandardPaths::GenericDataLocation, subPath);
-+ if (fullPath.isEmpty()) {
-+ return false;
-+ }
+ if (fullPath.isEmpty()) {
+ return false;
}
++ }
#endif
QTranslator *translator = new
QTranslator(QCoreApplication::instance());
+ if (!translator->load(fullPath)) {
++++++ extra-cmake-modules-5.67.0.tar.xz -> extra-cmake-modules-5.68.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.67.0/.gitignore
new/extra-cmake-modules-5.68.0/.gitignore
--- old/extra-cmake-modules-5.67.0/.gitignore 2020-01-28 17:26:25.000000000
+0100
+++ new/extra-cmake-modules-5.68.0/.gitignore 2020-03-07 09:34:00.000000000
+0100
@@ -20,3 +20,4 @@
CMakeLists.txt.user*
*.unc-backup*
__pycache__
+.cmake/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.67.0/CMakeLists.txt
new/extra-cmake-modules-5.68.0/CMakeLists.txt
--- old/extra-cmake-modules-5.67.0/CMakeLists.txt 2020-01-28
17:26:25.000000000 +0100
+++ new/extra-cmake-modules-5.68.0/CMakeLists.txt 2020-03-07
09:34:00.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.67.0") # handled by release scripts
+set(VERSION "5.68.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.67.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-5.68.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-5.67.0/modules/ECMGeneratePriFile.cmake
2020-01-28 17:26:25.000000000 +0100
+++ new/extra-cmake-modules-5.68.0/modules/ECMGeneratePriFile.cmake
2020-03-07 09:34:00.000000000 +0100
@@ -179,6 +179,18 @@
set(${EGPF_FILENAME_VAR} ${PRI_FILENAME} PARENT_SCOPE)
endif()
+ set(PRI_TARGET_MODULE_CONFIG "")
+ # backward compat: it was not obvious LIB_NAME needs to be a target name,
+ # and some projects where the target name was not the actual library output
name
+ # passed the output name for LIB_NAME, so .name & .module prperties are
correctly set.
+ # TODO: improve API dox, allow control over module name if target name !=
output name
+ if(TARGET ${EGPF_LIB_NAME})
+ get_target_property(target_type ${EGPF_LIB_NAME} TYPE)
+ if (target_type STREQUAL "STATIC_LIBRARY")
+ set(PRI_TARGET_MODULE_CONFIG "staticlib")
+ endif()
+ endif()
+
file(GENERATE
OUTPUT ${PRI_FILENAME}
CONTENT
@@ -193,6 +205,7 @@
QT.${PRI_TARGET_BASENAME}.private_includes =
QT.${PRI_TARGET_BASENAME}.libs = ${PRI_TARGET_LIBS}
QT.${PRI_TARGET_BASENAME}.depends = ${PRI_TARGET_QTDEPS}
+QT.${PRI_TARGET_BASENAME}.module_config = ${PRI_TARGET_MODULE_CONFIG}
"
)
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.67.0/modules/ECMQmLoader.cpp.in
new/extra-cmake-modules-5.68.0/modules/ECMQmLoader.cpp.in
--- old/extra-cmake-modules-5.67.0/modules/ECMQmLoader.cpp.in 2020-01-28
17:26:25.000000000 +0100
+++ new/extra-cmake-modules-5.68.0/modules/ECMQmLoader.cpp.in 2020-03-07
09:34:00.000000000 +0100
@@ -44,7 +44,7 @@
QString subPath = QStringLiteral("locale/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@[email protected]");
#if defined(Q_OS_ANDROID)
- const QString fullPath = QDir::homePath() +
QStringLiteral("/../qt-reserved-files/share/") + subPath;
+ const QString fullPath = QStringLiteral("assets:/share/") + subPath;
if (!QFile::exists(fullPath)) {
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.67.0/modules/ECMQtDeclareLoggingCategory.cmake
new/extra-cmake-modules-5.68.0/modules/ECMQtDeclareLoggingCategory.cmake
--- old/extra-cmake-modules-5.67.0/modules/ECMQtDeclareLoggingCategory.cmake
2020-01-28 17:26:25.000000000 +0100
+++ new/extra-cmake-modules-5.68.0/modules/ECMQtDeclareLoggingCategory.cmake
2020-03-07 09:34:00.000000000 +0100
@@ -2,17 +2,25 @@
# ECMQtDeclareLoggingCategory
# ---------------------------
#
-# Generate declarations for logging categories in Qt5.
+# This module provides the ``ecm_qt_declare_logging_category`` function for
+# generating declarations for logging categories in Qt5, and the
+# ``ecm_qt_install_logging_categories`` function for generating and installing
+# a file in KDebugSettings format with the info about all those categories,
+# as well as a file with info about any renamed categories if defined.
+# To include in that file any logging categories that are manually defined
+# also a function ``ecm_qt_export_logging_category`` is provided.
#
# ::
#
# ecm_qt_declare_logging_category(<sources_var>
-# HEADER <filename>
-# IDENTIFIER <identifier>
-# CATEGORY_NAME <category_name>
-# [DEFAULT_SEVERITY
-# <Debug|Info|Warning|
-# Critical|Fatal>])
+# HEADER <filename>
+# IDENTIFIER <identifier>
+# CATEGORY_NAME <category_name>
+# [OLD_CATEGORY_NAMES <oldest_cat_name> [<second_oldest_cat_name> [...]]]
+# [DEFAULT_SEVERITY <Debug|Info|Warning|Critical|Fatal>]
+# [EXPORT <exportid>]
+# [DESCRIPTION <description>]
+# )
#
# A header file, ``<filename>``, will be generated along with a corresponding
# source file, which will be added to ``<sources_var>``. These will provide a
@@ -30,10 +38,109 @@
#
# ``<identifier>`` may include namespaces (eg: ``foo::bar::IDENT``).
#
+# If ``EXPORT`` is passed, the category will be registered for the group id
+# ``<exportid>``. Info about the categories of that group can then be
+# generated in a file and installed by that group id with the
+# ``ecm_qt_install_logging_categories`` function. In that case also
``DESCRIPTION``
+# will need to be passed, with ``<description>`` being a short single line
text.
+# And ``OLD_CATEGORY_NAMES`` can be used to inform about any renamings of the
category,
+# so user settings can be migrated. Since 5.68.0.
+#
# Since 5.14.0.
+#
+# ::
+#
+# ecm_qt_export_logging_category(
+# IDENTIFIER <identifier>
+# CATEGORY_NAME <category_name>
+# [OLD_CATEGORY_NAMES <oldest_category_name>
[<second_oldest_category_name> [...]]]
+# EXPORT <exportid>
+# DESCRIPTION <description>
+# [DEFAULT_SEVERITY <Debug|Info|Warning|Critical|Fatal>]
+# )
+#
+# Registers a logging category for being included in the generated and
+# installed KDebugSettings files. To be used for categories who are declared by
+# manual code or other ways instead of code generated with
+# ``ecm_qt_declare_logging_category``.
+#
+# ``<identifier>`` may include namespaces (eg: ``foo::bar::IDENT``).
+#
+# ``EXPORT`` specifies the group id with which the category will be registered.
+# Info about the categories of that group can then be generated in a file and
+# installed by that group id with the ``ecm_qt_install_logging_categories``
function.
+#
+# ``DESCRIPTION`` specifies a short single line text describing the category.
+#
+# ``OLD_CATEGORY_NAMES`` can be used to inform about any renamings of the
category,
+# so user settings can be migrated.
+#
+# Since 5.68.0.
+#
+# ::
+#
+# ecm_qt_install_logging_categories(
+# EXPORT <exportid>
+# [FILE <filename>]
+# DESTINATION <install_path>
+# [SORT]
+# [COMPONENT <component>]
+# )
+#
+# Generates and installs a file in KDebugSettings format with the info about
all
+# the categories registered for the group ``<exportid>``, as well as a file
with
+# info about any renamed categories, if there are.
+#
+# The method call needs to be after the last
``ecm_qt_declare_logging_category``
+# call which uses the same ``<exportid>``. This can be in the same directory,
or
+# any subdirectory or parent directory.
+#
+# ``EXPORT`` specifies the group id of categories whose informatipn should be
+# stored in the file generated and installed.
+#
+# ``FILE`` specifies the name of the file generated and installed. It will
default
+# to lower-cased ``<exportid>.categories``.
+#
+# ``DESTINATION`` specifies where the generated file will be
+# installed.
+#
+# IF ``SORT`` is set, entries will be sorted by identifiers.
+#
+# ``COMPONENT`` specifies the installation component name with which the
install
+# rules for the generated file are associated.
+#
+# Example usage:
+#
+# .. code-block:: cmake
+#
+# ecm_qt_declare_logging_category(
+# MYPROJECT_SRCS
+# HEADER "myproject_debug.h"
+# IDENTIFIER "MYPROJECT_DEBUG"
+# CATEGORY_NAME "myproject"
+# OLD_CATEGORY_NAMES "myprojectlog"
+# DESCRIPTION "My project"
+# EXPORT MyProject
+# )
+#
+# ecm_qt_export_logging_category(
+# IDENTIFIER "MYPROJECT_SUBMODULE_DEBUG"
+# CATEGORY_NAME "myproject.submodule"
+# DESCRIPTION "My project - submodule"
+# EXPORT MyProject
+# )
+#
+# ecm_qt_install_logging_categories(
+# EXPORT MyProject
+# FILE myproject.categories
+# DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}"
+# )
+#
+# Since 5.68.0.
#=============================================================================
# Copyright 2015 Alex Merry <[email protected]>
+# Copyright 2020 Friedrich W. H. Kossebau <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -63,10 +170,55 @@
set(_ECM_QT_DECLARE_LOGGING_CATEGORY_TEMPLATE_CPP
"${CMAKE_CURRENT_LIST_DIR}/ECMQtDeclareLoggingCategory.cpp.in")
set(_ECM_QT_DECLARE_LOGGING_CATEGORY_TEMPLATE_H
"${CMAKE_CURRENT_LIST_DIR}/ECMQtDeclareLoggingCategory.h.in")
+function(ecm_qt_export_logging_category)
+ set(options)
+ set(oneValueArgs IDENTIFIER CATEGORY_NAME DEFAULT_SEVERITY EXPORT
DESCRIPTION)
+ set(multiValueArgs OLD_CATEGORY_NAMES)
+ cmake_parse_arguments(ARG "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
+
+ if(ARG_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unexpected arguments to
ecm_qt_export_logging_category: ${ARG_UNPARSED_ARGUMENTS}")
+ endif()
+ if(NOT ARG_IDENTIFIER)
+ message(FATAL_ERROR "Missing IDENTIFIER argument for
ecm_qt_export_logging_category")
+ endif()
+ if(NOT ARG_CATEGORY_NAME)
+ message(FATAL_ERROR "Missing CATEGORY_NAME argument for
ecm_qt_export_logging_category")
+ endif()
+ if(NOT ARG_DEFAULT_SEVERITY)
+ set(ARG_DEFAULT_SEVERITY Info)
+ set(is_explicite_default_severity FALSE)
+ else()
+ set(acceptible_severities Debug Info Warning Critical Fatal)
+ list(FIND acceptible_severities "${ARG_DEFAULT_SEVERITY}" pos)
+ if (pos EQUAL -1)
+ message(FATAL_ERROR "Unknown DEFAULT_SEVERITY ${pos}")
+ endif()
+ set(is_explicite_default_severity TRUE)
+ endif()
+ if(NOT ARG_EXPORT)
+ message(FATAL_ERROR "Missing EXPORT argument for
ecm_qt_export_logging_category.")
+ endif()
+ if(NOT ARG_DESCRIPTION)
+ message(FATAL_ERROR "Missing DESCRIPTION argument for
ecm_qt_export_logging_category.")
+ endif()
+
+ # note data in global properties
+ set(_propertyprefix "ECM_QT_LOGGING_CATEGORY_${ARG_EXPORT}")
+ set_property(GLOBAL APPEND PROPERTY "${_propertyprefix}_CATEGORIES"
${ARG_CATEGORY_NAME})
+ set_property(GLOBAL PROPERTY
"${_propertyprefix}_IDENTIFIER_${ARG_CATEGORY_NAME}" "${ARG_IDENTIFIER}")
+ set_property(GLOBAL PROPERTY
"${_propertyprefix}_DESCRIPTION_${ARG_CATEGORY_NAME}" "${ARG_DESCRIPTION}")
+ set_property(GLOBAL PROPERTY
"${_propertyprefix}_OLD_NAMES_${ARG_CATEGORY_NAME}" "${ARG_OLD_CATEGORY_NAMES}")
+ if (is_explicite_default_severity)
+ set_property(GLOBAL PROPERTY
"${_propertyprefix}_DEFAULT_SEVERITY_${ARG_CATEGORY_NAME}"
"${ARG_DEFAULT_SEVERITY}")
+ endif()
+endfunction()
+
+
function(ecm_qt_declare_logging_category sources_var)
set(options)
- set(oneValueArgs HEADER IDENTIFIER CATEGORY_NAME DEFAULT_SEVERITY)
- set(multiValueArgs)
+ set(oneValueArgs HEADER IDENTIFIER CATEGORY_NAME DEFAULT_SEVERITY EXPORT
DESCRIPTION)
+ set(multiValueArgs OLD_CATEGORY_NAMES)
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
if(ARG_UNPARSED_ARGUMENTS)
@@ -83,12 +235,17 @@
endif()
if(NOT ARG_DEFAULT_SEVERITY)
set(ARG_DEFAULT_SEVERITY Info)
+ set(is_explicite_default_severity FALSE)
else()
set(acceptible_severities Debug Info Warning Critical Fatal)
list(FIND acceptible_severities "${ARG_DEFAULT_SEVERITY}" pos)
if (pos EQUAL -1)
message(FATAL_ERROR "Unknown DEFAULT_SEVERITY ${pos}")
endif()
+ set(is_explicite_default_severity TRUE)
+ endif()
+ if(ARG_EXPORT AND NOT ARG_DESCRIPTION)
+ message(FATAL_ERROR "Missing DESCRIPTION argument for
ecm_qt_declare_logging_category.")
endif()
if (NOT IS_ABSOLUTE "${ARG_HEADER}")
@@ -132,4 +289,125 @@
set(sources "${${sources_var}}")
list(APPEND sources "${cpp_filename}")
set(${sources_var} "${sources}" PARENT_SCOPE)
+
+ # note data in global properties
+ if (ARG_EXPORT)
+ set(_default_severity)
+ if (is_explicite_default_severity)
+ set(_default_severity DEFAULT_SEVERITY ${ARG_DEFAULT_SEVERITY})
+ endif()
+ set(_old_category_name)
+ if (ARG_OLD_CATEGORY_NAMES)
+ set(_old_category_names OLD_CATEGORY_NAMES
${ARG_OLD_CATEGORY_NAMES})
+ endif()
+ ecm_qt_export_logging_category(
+ IDENTIFIER ${ARG_IDENTIFIER}
+ CATEGORY_NAME ${ARG_CATEGORY_NAME}
+ ${_old_category_names}
+ ${_default_severity}
+ EXPORT ${ARG_EXPORT}
+ DESCRIPTION "${ARG_DESCRIPTION}"
+ )
+ endif()
+endfunction()
+
+
+function(ecm_qt_install_logging_categories)
+ set(options SORT)
+ set(oneValueArgs FILE EXPORT DESTINATION COMPONENT)
+ set(multiValueArgs)
+
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
+
+ if(NOT ARGS_EXPORT)
+ message(FATAL_ERROR "Missing EXPORT argument for
ecm_qt_install_logging_categories")
+ endif()
+
+ if(NOT ARGS_DESTINATION)
+ message(FATAL_ERROR "Missing DESTINATION argument for
ecm_qt_install_logging_categories")
+ endif()
+
+ if(NOT ARGS_FILE)
+ string(TOLOWER "${ARGS_EXPORT}.categories" ARGS_FILE)
+ endif()
+
+ set(_propertyprefix "ECM_QT_LOGGING_CATEGORY_${ARGS_EXPORT}")
+ get_property(has_category GLOBAL PROPERTY "${_propertyprefix}_CATEGORIES"
SET)
+
+ if (NOT has_category)
+ message(AUTHOR_WARNING "No Qt logging categories exported for
\"${ARGS_EXPORT}\", generating & installing an empty file.")
+ endif()
+
+ get_property(_categories GLOBAL PROPERTY "${_propertyprefix}_CATEGORIES")
+ if (ARGS_SORT)
+ list(SORT _categories)
+ endif()
+
+ set(_renamed_categories)
+
+ # generate categories file
+ if (NOT IS_ABSOLUTE "${ARGS_FILE}")
+ set(ARGS_FILE "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_FILE}")
+ endif()
+
+ file(WRITE ${ARGS_FILE}
+"# KDebugSettings data file
+# This file was generated by ecm_qt_install_logging_categories(). DO NOT EDIT!
+
+")
+
+ foreach(_category IN LISTS _categories)
+ get_property(_description GLOBAL PROPERTY
"${_propertyprefix}_DESCRIPTION_${_category}")
+ get_property(_identifier GLOBAL PROPERTY
"${_propertyprefix}_IDENTIFIER_${_category}")
+ get_property(_default_severity GLOBAL PROPERTY
"${_propertyprefix}_DEFAULT_SEVERITY_${_category}")
+ if (_default_severity)
+ string(TOUPPER "${_default_severity}" _default_severity)
+ set(_default_severity "DEFAULT_SEVERITY [${_default_severity}] ")
# final space wanted
+ endif()
+ get_property(_old_category_names GLOBAL PROPERTY
"${_propertyprefix}_OLD_NAMES_${_category}")
+ if (_old_category_names)
+ list(APPEND _renamed_categories ${_category})
+ endif()
+
+ # Format:
+ # logname<space>description(optional <space> DEFAULT_SEVERITY
[DEFAULT_CATEGORY] as WARNING/DEBUG/INFO/CRITICAL) optional IDENTIFIER [...])
+ file(APPEND ${ARGS_FILE} "${_category} ${_description}
${_default_severity}IDENTIFIER [${_identifier}]\n")
+ endforeach()
+
+ set(_renamed_cats_file)
+ if (_renamed_categories)
+ get_filename_component(_dir ${ARGS_FILE} DIRECTORY)
+ get_filename_component(_base_name ${ARGS_FILE} NAME_WE)
+ set(_renamed_cats_file "${_dir}/${_base_name}.renamecategories")
+ file(WRITE ${_renamed_cats_file}
+"# KDebugSettings data file
+# This file was generated by ecm_qt_install_logging_categories(). DO NOT EDIT!
+
+")
+
+ foreach(_category IN LISTS _renamed_categories)
+ get_property(_category_name_history GLOBAL PROPERTY
"${_propertyprefix}_OLD_NAMES_${_category}")
+
+ list(APPEND _category_name_history ${_category})
+ list(GET _category_name_history 0 _old_category_name)
+ list(REMOVE_AT _category_name_history 0)
+ foreach(_category_name IN LISTS _category_name_history)
+ # Format:
+ # oldlogname<space>newlogname
+ file(APPEND ${_renamed_cats_file} "${_old_category_name}
${_category_name}\n")
+ set(_old_category_name ${_category_name})
+ endforeach()
+ endforeach()
+ endif()
+
+ # install files
+ set(_component_install)
+ if (ARGS_COMPONENT)
+ set(_component_install COMPONENT ${ARGS_COMPONENT})
+ endif()
+ install(
+ FILES ${ARGS_FILE} ${_renamed_cats_file}
+ DESTINATION "${ARGS_DESTINATION}"
+ ${_component_install}
+ )
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.67.0/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt
new/extra-cmake-modules-5.68.0/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt
---
old/extra-cmake-modules-5.67.0/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt
2020-01-28 17:26:25.000000000 +0100
+++
new/extra-cmake-modules-5.68.0/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt
2020-03-07 09:34:00.000000000 +0100
@@ -5,12 +5,35 @@
set(CMAKE_MODULE_PATH ${ECM_MODULE_DIR})
include(ECMQtDeclareLoggingCategory)
+include(CMakeParseArguments)
+
+function (check_file)
+ set(options)
+ set(oneValueArgs GENERATED EXPECTED)
+ set(multiValueArgs)
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
+
+ if (NOT EXISTS "${ARGS_GENERATED}")
+ message(FATAL_ERROR "${ARGS_GENERATED} was not generated")
+ endif()
+ file(READ "${ARGS_GENERATED}" generated_contents)
+ if (NOT EXISTS "${ARGS_EXPECTED}")
+ message(FATAL_ERROR "Original ${ARGS_EXPECTED} was not found")
+ endif()
+ file(READ "${ARGS_EXPECTED}" original_contents)
+ if (NOT "${generated_contents}" STREQUAL "${original_contents}")
+ message(FATAL_ERROR "${generated_file} contains
'${generated_contents}' instead of '${original_contents}'")
+ endif()
+endfunction()
ecm_qt_declare_logging_category(
sources
HEADER "log1.h"
IDENTIFIER "log1"
CATEGORY_NAME "log.one"
+ OLD_CATEGORY_NAMES "log1old"
+ DESCRIPTION "log 1"
+ EXPORT LOG
)
ecm_qt_declare_logging_category(
@@ -18,6 +41,9 @@
HEADER "log2.h"
IDENTIFIER "foo::bar::log2"
CATEGORY_NAME "log.two"
+ DEFAULT_SEVERITY Info
+ DESCRIPTION "log 2"
+ EXPORT LOG
)
ecm_qt_declare_logging_category(
@@ -28,6 +54,15 @@
DEFAULT_SEVERITY Critical
)
+ecm_qt_export_logging_category(
+ IDENTIFIER "log4"
+ CATEGORY_NAME "log.four"
+ OLD_CATEGORY_NAMES "logfouroldest" "log4old"
+ DEFAULT_SEVERITY Warning
+ EXPORT LOG
+ DESCRIPTION "log 4"
+)
+
find_package(Qt5Core REQUIRED)
add_executable(testmain testmain.cpp ${sources})
@@ -40,3 +75,18 @@
Qt5::Core
)
+ecm_qt_install_logging_categories(
+ EXPORT LOG
+ FILE log.categories
+ DESTINATION "${CMAKE_BINARY_DIR}/dummyinstall"
+)
+
+check_file(
+ GENERATED "${CMAKE_CURRENT_BINARY_DIR}/log.categories"
+ EXPECTED "${CMAKE_CURRENT_SOURCE_DIR}/log.categories"
+)
+check_file(
+ GENERATED "${CMAKE_CURRENT_BINARY_DIR}/log.renamecategories"
+ EXPECTED "${CMAKE_CURRENT_SOURCE_DIR}/log.renamecategories"
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.67.0/tests/ECMQtDeclareLoggingCategoryTest/log.categories
new/extra-cmake-modules-5.68.0/tests/ECMQtDeclareLoggingCategoryTest/log.categories
---
old/extra-cmake-modules-5.67.0/tests/ECMQtDeclareLoggingCategoryTest/log.categories
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.68.0/tests/ECMQtDeclareLoggingCategoryTest/log.categories
2020-03-07 09:34:00.000000000 +0100
@@ -0,0 +1,6 @@
+# KDebugSettings data file
+# This file was generated by ecm_qt_install_logging_categories(). DO NOT EDIT!
+
+log.one log 1 IDENTIFIER [log1]
+log.two log 2 DEFAULT_SEVERITY [INFO] IDENTIFIER [foo::bar::log2]
+log.four log 4 DEFAULT_SEVERITY [WARNING] IDENTIFIER [log4]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.67.0/tests/ECMQtDeclareLoggingCategoryTest/log.renamecategories
new/extra-cmake-modules-5.68.0/tests/ECMQtDeclareLoggingCategoryTest/log.renamecategories
---
old/extra-cmake-modules-5.67.0/tests/ECMQtDeclareLoggingCategoryTest/log.renamecategories
1970-01-01 01:00:00.000000000 +0100
+++
new/extra-cmake-modules-5.68.0/tests/ECMQtDeclareLoggingCategoryTest/log.renamecategories
2020-03-07 09:34:00.000000000 +0100
@@ -0,0 +1,6 @@
+# KDebugSettings data file
+# This file was generated by ecm_qt_install_logging_categories(). DO NOT EDIT!
+
+log1old log.one
+logfouroldest log4old
+log4old log.four
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.67.0/toolchain/Android.cmake
new/extra-cmake-modules-5.68.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.67.0/toolchain/Android.cmake 2020-01-28
17:26:25.000000000 +0100
+++ new/extra-cmake-modules-5.68.0/toolchain/Android.cmake 2020-03-07
09:34:00.000000000 +0100
@@ -167,18 +167,24 @@
set(CMAKE_ANDROID_STL_TYPE c++_shared)
endif()
-include(${CMAKE_ROOT}/Modules/Platform/Android-Clang.cmake REQUIRED)
-include(${CMAKE_ROOT}/Modules/Platform/Android-Initialize.cmake REQUIRED)
+# let the Android NDK toolchain file do the actual work
+set(ANDROID_PLATFORM "android-${CMAKE_ANDROID_API}")
+set(ANDROID_STL ${CMAKE_ANDROID_STL_TYPE})
+include(${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake REQUIRED)
+
+# these aren't set yet at this point by the Android toolchain, but without
+# those the find_package() call in ECMAndroidDeployQt will fail
+set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a")
+
+# determine STL architecture, which is using a different format than
ANDROID_ARCH_ABI
+string(REGEX REPLACE "-(clang)?([0-9].[0-9])?$" "" ECM_ANDROID_STL_ARCH
${ANDROID_TOOLCHAIN_NAME})
if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH)
SET(ECM_ADDITIONAL_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH})
endif()
-SET(CMAKE_FIND_ROOT_PATH ${CMAKE_ANDROID_NDK} ${CMAKE_ANDROID_NDK}/sysroot
${CMAKE_SYSROOT} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+LIST(APPEND CMAKE_FIND_ROOT_PATH ${ECM_ADDITIONAL_FIND_ROOT_PATH})
#we want executables to be shared libraries, hooks will invoke the exported
cmake function
set(CMAKE_CXX_LINK_EXECUTABLE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.67.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.68.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.67.0/toolchain/ECMAndroidDeployQt.cmake
2020-01-28 17:26:25.000000000 +0100
+++ new/extra-cmake-modules-5.68.0/toolchain/ECMAndroidDeployQt.cmake
2020-03-07 09:34:00.000000000 +0100
@@ -3,7 +3,11 @@
function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET
ECM_ADDITIONAL_FIND_ROOT_PATH)
set(EXPORT_DIR
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/")
- set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
+ if (Qt5Core_VERSION VERSION_LESS 5.14.0)
+ set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
+ else()
+ set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}_${CMAKE_ANDROID_ARCH_ABI}.so")
+ endif()
set(QML_IMPORT_PATHS "")
foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
# qmlimportscanner chokes on symlinks, so we need to resolve those
first
@@ -28,8 +32,14 @@
set(EXTRA_PREFIX_DIRS "\"${prefix}\"")
endif()
endforeach()
+
+ if (Qt5Core_VERSION VERSION_LESS 5.14.0)
+ set(_deployment_file_template
"${_CMAKE_ANDROID_DIR}/deployment-file.json.in")
+ else()
+ set(_deployment_file_template
"${_CMAKE_ANDROID_DIR}/deployment-file-qt514.json.in")
+ endif()
string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" _LOWER_CMAKE_HOST_SYSTEM_NAME)
- configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1")
+ configure_file("${_deployment_file_template}"
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1")
file(GENERATE OUTPUT
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in2"
INPUT
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.67.0/toolchain/deployment-file-qt514.json.in
new/extra-cmake-modules-5.68.0/toolchain/deployment-file-qt514.json.in
--- old/extra-cmake-modules-5.67.0/toolchain/deployment-file-qt514.json.in
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.68.0/toolchain/deployment-file-qt514.json.in
2020-03-07 09:34:00.000000000 +0100
@@ -0,0 +1,18 @@
+{
+ "qt": "@_qt5Core_install_prefix@",
+ "sdk": "@ANDROID_SDK_ROOT@",
+ "ndk": "@CMAKE_ANDROID_NDK@",
+ "toolchain-prefix": "llvm",
+ "tool-prefix": "llvm",
+ "ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@",
+ "application-binary": "@QTANDROID_EXPORTED_TARGET@",
+ "qml-root-path": "@CMAKE_SOURCE_DIR@",
+ @DEFINE_QML_IMPORT_PATHS@
+ ##EXTRALIBS##
+ ##EXTRAPLUGINS##
+ "android-package-source-directory":
"$<TARGET_PROPERTY:create-apk-${QTANDROID_EXPORTED_TARGET},ANDROID_APK_DIR>",
+ "stdcpp-path": "@CMAKE_SYSROOT@/usr/lib",
+ "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@",
+ "extraPrefixDirs": [ @EXTRA_PREFIX_DIRS@ ],
+ "architectures": { "@CMAKE_ANDROID_ARCH_ABI@": "@ECM_ANDROID_STL_ARCH@" }
+}
