Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2022-03-14 19:34:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon Mar 14 19:34:06 2022 rev:99 rq:961217 version:5.92.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2022-02-24 18:21:11.622694523 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.25692/extra-cmake-modules.changes
2022-03-14 19:35:17.881999170 +0100
@@ -1,0 +2,17 @@
+Mon Mar 7 09:26:40 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.92.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.92.0
+- Changes since 5.91.0:
+ * specifydependencies: fix syntax in debug output
+ * Add Qt6 Android CI
+ * [ECMQmlModule] Fix doc syntax
+ * Add missing doc links
+ * ECMGeneratePriFile: support multiple include install dirs
+ * KDEInstallDirs6: replace ECMQueryQMake usage with qtpaths
+ * Adapt Android toolchain file and FindGradle to Qt6
+ * Fix typos
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.91.0.tar.xz
extra-cmake-modules-5.91.0.tar.xz.sig
New:
----
extra-cmake-modules-5.92.0.tar.xz
extra-cmake-modules-5.92.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.NXn1ye/_old 2022-03-14 19:35:18.429999828 +0100
+++ /var/tmp/diff_new_pack.NXn1ye/_new 2022-03-14 19:35:18.433999832 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.91
+%define _tar_path 5.92
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: extra-cmake-modules
-Version: 5.91.0
+Version: 5.92.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.91.0.tar.xz -> extra-cmake-modules-5.92.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.91.0/.gitlab-ci.yml
new/extra-cmake-modules-5.92.0/.gitlab-ci.yml
--- old/extra-cmake-modules-5.91.0/.gitlab-ci.yml 2022-02-05
16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/.gitlab-ci.yml 2022-02-27
21:48:24.000000000 +0100
@@ -5,6 +5,7 @@
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
docs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.91.0/CMakeLists.txt
new/extra-cmake-modules-5.92.0/CMakeLists.txt
--- old/extra-cmake-modules-5.91.0/CMakeLists.txt 2022-02-05
16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/CMakeLists.txt 2022-02-27
21:48:24.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.91.0") # handled by release scripts
+set(VERSION "5.92.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.91.0/docs/module/CheckAtomic.rst
new/extra-cmake-modules-5.92.0/docs/module/CheckAtomic.rst
--- old/extra-cmake-modules-5.91.0/docs/module/CheckAtomic.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/docs/module/CheckAtomic.rst 2022-02-27
21:48:24.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/CheckAtomic.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/docs/module/ECMFindQmlModule.rst
new/extra-cmake-modules-5.92.0/docs/module/ECMFindQmlModule.rst
--- old/extra-cmake-modules-5.91.0/docs/module/ECMFindQmlModule.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/docs/module/ECMFindQmlModule.rst
2022-02-27 21:48:24.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMFindQmlModule.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/docs/module/ECMQMLModules.rst
new/extra-cmake-modules-5.92.0/docs/module/ECMQMLModules.rst
--- old/extra-cmake-modules-5.91.0/docs/module/ECMQMLModules.rst
2022-02-05 16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/docs/module/ECMQMLModules.rst
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-.. ecm-module:: ../../modules/ECMQMLModules.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/docs/module/ECMQmlModule.rst
new/extra-cmake-modules-5.92.0/docs/module/ECMQmlModule.rst
--- old/extra-cmake-modules-5.91.0/docs/module/ECMQmlModule.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/docs/module/ECMQmlModule.rst 2022-02-27
21:48:24.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMQmlModule.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/docs/module/QtVersionOption.rst
new/extra-cmake-modules-5.92.0/docs/module/QtVersionOption.rst
--- old/extra-cmake-modules-5.91.0/docs/module/QtVersionOption.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/docs/module/QtVersionOption.rst
2022-02-27 21:48:24.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/QtVersionOption.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/find-modules/FindGradle.cmake
new/extra-cmake-modules-5.92.0/find-modules/FindGradle.cmake
--- old/extra-cmake-modules-5.91.0/find-modules/FindGradle.cmake
2022-02-05 16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/find-modules/FindGradle.cmake
2022-02-27 21:48:24.000000000 +0100
@@ -27,18 +27,24 @@
Since 5.76.0.
#]=======================================================================]
+include(${CMAKE_CURRENT_LIST_DIR}/../modules/QtVersionOption.cmake)
include(CMakeParseArguments)
include(FindPackageHandleStandardArgs)
-find_package(Qt5Core REQUIRED)
+find_package(Qt${QT_MAJOR_VERSION}Core REQUIRED)
+set (Gradle_PRECOMMAND "")
if (NOT WIN32)
set(Gradle_EXECUTABLE ${CMAKE_BINARY_DIR}/gradle/gradlew)
+ # the gradlew script installed by Qt6 is not executable, so running it
directly fails
+ if (QT_MAJOR_VERSION EQUAL "6")
+ set(Gradle_PRECOMMAND "sh")
+ endif()
else()
set(Gradle_EXECUTABLE ${CMAKE_BINARY_DIR}/gradle/gradlew.bat)
endif()
-get_target_property(_qt_core_location Qt5::Core LOCATION)
+get_target_property(_qt_core_location Qt${QT_MAJOR_VERSION}::Core LOCATION)
get_filename_component(_qt_install_root ${_qt_core_location} DIRECTORY)
get_filename_component(_qt_install_root ${_qt_install_root}/../ ABSOLUTE)
@@ -50,6 +56,13 @@
)
add_custom_target(gradle DEPENDS ${Gradle_EXECUTABLE})
+# Android Gradle plugin version (not the Gradle version!) used by Qt, for use
in our own build.gradle files
+if (QT_MAJOR_VERSION EQUAL "5")
+ set(Gradle_ANDROID_GRADLE_PLUGIN_VERSION 3.6.4)
+else()
+ set(Gradle_ANDROID_GRADLE_PLUGIN_VERSION 7.0.2)
+endif()
+
find_package_handle_standard_args(Gradle DEFAULT_MSG Gradle_EXECUTABLE)
function(gradle_add_aar target)
@@ -71,7 +84,7 @@
file(GLOB_RECURSE _src_files CONFIGURE_DEPENDS "*")
add_custom_command(
OUTPUT ${_build_root}/build/outputs/aar/${ARG_NAME}${_aar_suffix}.aar
- COMMAND ${Gradle_EXECUTABLE} ${_aar_gradleCmd}
+ COMMAND ${Gradle_PRECOMMAND} ${Gradle_EXECUTABLE} ${_aar_gradleCmd}
# this allows make create-apk to work without installations for apps
with AAR libs in the same repository
COMMAND ${CMAKE_COMMAND} -E copy
${_build_root}/build/outputs/aar/${ARG_NAME}${_aar_suffix}.aar
${CMAKE_BINARY_DIR}/jar/${ARG_NAME}.aar
DEPENDS ${Gradle_EXECUTABLE} ${_src_files}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/kde-modules/KDEInstallDirs6.cmake
new/extra-cmake-modules-5.92.0/kde-modules/KDEInstallDirs6.cmake
--- old/extra-cmake-modules-5.91.0/kde-modules/KDEInstallDirs6.cmake
2022-02-05 16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/kde-modules/KDEInstallDirs6.cmake
2022-02-27 21:48:24.000000000 +0100
@@ -5,6 +5,7 @@
# SPDX-FileCopyrightText: 2006-2007 Laurent Montel <[email protected]>
# SPDX-FileCopyrightText: 2006-2013 Alex Neundorf <[email protected]>
# SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]>
+# SPDX-FileCopyrightText: 2021 Ahmad Samir <[email protected]>
#
# SPDX-License-Identifier: BSD-3-Clause
@@ -131,7 +132,6 @@
``SYSTEMDUSERUNITDIR``
Systemd User Units (``lib/systemd/user``)
-TODO TODO TODO
If ``KDE_INSTALL_USE_QT_SYS_PATHS`` is set to TRUE before including this
module, the default values for some variables are instead queried from
Qt6's qmake (where mentioned in the parentheses above).
@@ -197,40 +197,42 @@
_define_non_cache(LIBEXECDIR_KF "${CMAKE_INSTALL_LIBEXECDIR}/kf6")
endif()
-# TODO TODO TODO
-#include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+find_package(Qt6 COMPONENTS CoreTools REQUIRED CONFIG)
+get_target_property(qtpaths_executable Qt6::qtpaths LOCATION)
+execute_process(COMMAND ${qtpaths_executable} --query QT_INSTALL_PREFIX
OUTPUT_VARIABLE qt_install_prefix_dir)
+
+set(_qt_prefix_is_cmake_install_prefix FALSE)
+if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ set(_qt_prefix_is_cmake_install_prefix TRUE)
+endif()
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
-# TODO TODO TODO
- #query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
- #if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
- # message(STATUS "Installing in the same prefix as Qt, adopting their
path scheme.")
- # set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
- #endif()
+ if(_qt_prefix_is_cmake_install_prefix)
+ message(STATUS "Installing in the same prefix as Qt, adopting their
path scheme.")
+ set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
+ endif()
endif()
-option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, QCH files for
Qt-based libs, Plugins and Imports to the Qt 5 install dir"
"${_default_KDE_INSTALL_USE_QT_SYS_PATHS}")
-# TODO TODO TODO
-#if(KDE_INSTALL_USE_QT_SYS_PATHS)
-# # Qt-specific vars
-# query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
-# query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS)
-#
-# if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
-# file(RELATIVE_PATH qt_plugins_dir ${qt_install_prefix_dir}
${qt_plugins_dir})
-# endif()
-# _define_absolute(QTPLUGINDIR ${qt_plugins_dir}
-# "Qt plugins")
-#
-# query_qmake(qt_qml_dir QT_INSTALL_QML)
-#
-# if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
-# file(RELATIVE_PATH qt_qml_dir ${qt_install_prefix_dir} ${qt_qml_dir})
-# endif()
-# _define_absolute(QMLDIR ${qt_qml_dir}
-# "QtQuick2 imports")
-#else()
+option (KDE_INSTALL_USE_QT_SYS_PATHS
+ "Install mkspecs files, QCH files for Qt-based libs, Plugins and
Imports to the Qt 6 install dir"
+ "${_default_KDE_INSTALL_USE_QT_SYS_PATHS}"
+)
+
+if(KDE_INSTALL_USE_QT_SYS_PATHS)
+ # Qt-specific vars
+ execute_process(COMMAND ${qtpaths_executable} --query QT_INSTALL_PLUGINS
OUTPUT_VARIABLE qt_plugins_dir)
+ if(_qt_prefix_is_cmake_install_prefix)
+ file(RELATIVE_PATH qt_plugins_dir ${qt_install_prefix_dir}
${qt_plugins_dir})
+ endif()
+ _define_absolute(QTPLUGINDIR ${qt_plugins_dir} "Qt plugins")
+
+ execute_process(COMMAND ${qtpaths_executable} --query QT_INSTALL_QML
OUTPUT_VARIABLE qt_qml_dir)
+ if(_qt_prefix_is_cmake_install_prefix)
+ file(RELATIVE_PATH qt_qml_dir ${qt_install_prefix_dir} ${qt_qml_dir})
+ endif()
+ _define_absolute(QMLDIR ${qt_qml_dir} "QtQuick2 imports")
+else()
set(_pluginsDirParent LIBDIR)
if (ANDROID)
set(_pluginsDirParent)
@@ -241,7 +243,7 @@
_define_relative(QMLDIR LIBDIR "qml"
"QtQuick2 imports")
-#endif()
+endif()
_define_relative(PLUGINDIR QTPLUGINDIR ""
"Plugins")
@@ -250,17 +252,15 @@
_define_non_cache(DATADIR_KF "${CMAKE_INSTALL_DATADIR}/kf6")
-# TODO TODO TODO
# Qt-specific data vars
-#if(KDE_INSTALL_USE_QT_SYS_PATHS)
-# query_qmake(qt_docs_dir QT_INSTALL_DOCS)
-#
-# _define_absolute(QTQCHDIR ${qt_docs_dir}
-# "documentation bundles in QCH format for Qt-extending libraries")
-#else()
+if(KDE_INSTALL_USE_QT_SYS_PATHS)
+ execute_process(COMMAND ${qtpaths_executable} --query QT_INSTALL_DOCS
OUTPUT_VARIABLE qt_docs_dir)
+
+ _define_absolute(QTQCHDIR ${qt_docs_dir} "documentation bundles in QCH
format for Qt-extending libraries")
+else()
_define_relative(QTQCHDIR DATAROOTDIR "doc/qch"
"documentation bundles in QCH format for Qt-extending libraries")
-#endif()
+endif()
# KDE Framework-specific things
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/modules/ECMDeprecationSettings.cmake
new/extra-cmake-modules-5.92.0/modules/ECMDeprecationSettings.cmake
--- old/extra-cmake-modules-5.91.0/modules/ECMDeprecationSettings.cmake
2022-02-05 16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/modules/ECMDeprecationSettings.cmake
2022-02-27 21:48:24.000000000 +0100
@@ -14,7 +14,7 @@
Otherwise the name for the definition is generated using
`${IDENTIFIER}_DISABLE_DEPRECATED_BEFORE_AND_AT`,
following the naming of the generated code in
:kde-module:`ECMGenerateExportHeaders`.
The version for the definition can be overwritten, by passing definition name
and the deprecation version
-as a CMake defintion. This allows one to exclude deprecations without having
to edit the CMakeLists.txt file.
+as a CMake definition. This allows one to exclude deprecations without having
to edit the CMakeLists.txt file.
This module provides the following function:
@@ -57,7 +57,7 @@
list(LENGTH ARGS_UNPARSED_ARGUMENTS PAIR_COUNT)
math(EXPR is_even_number "${PAIR_COUNT} % 2")
if (NOT is_even_number EQUAL 0)
- message(FATAL_ERROR "Expected number of argumments an even number of
identifiers and version")
+ message(FATAL_ERROR "Expected number of arguments is an even number of
identifiers and version")
endif()
math(EXPR number_pairs "(${PAIR_COUNT} / 2) - 1")
foreach (it RANGE ${number_pairs})
@@ -92,7 +92,7 @@
if (NOT CMAKE_MATCH_1)
message(FATAL_ERROR "Failed to get major version from
${DEPRECATION_VERSION}")
endif()
- # Add 1 to the major version and sture it as a hex value
+ # Add 1 to the major version and store it as a hex value
math(EXPR next_major_version "(${CMAKE_MATCH_1} + 1) * 65536 "
OUTPUT_FORMAT HEXADECIMAL)
add_definitions(-D${DEPRECATION_NAME}_DEPRECATED_WARNINGS_SINCE=${next_major_version})
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-5.92.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-5.91.0/modules/ECMGeneratePriFile.cmake
2022-02-05 16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/modules/ECMGeneratePriFile.cmake
2022-02-27 21:48:24.000000000 +0100
@@ -26,7 +26,8 @@
[VERSION <version>] # since 5.83
[DEPS "<dep> [<dep> [...]]"]
[FILENAME_VAR <filename_variable>]
- [INCLUDE_INSTALL_DIR <dir>]
+ [INCLUDE_INSTALL_DIRS <dir> [<dir> [...]]] # since
5.92
+ [INCLUDE_INSTALL_DIR <dir>] # deprecated since 5.92
[LIB_INSTALL_DIR <dir>])
If your CMake project produces a Qt-based library, you may expect there to be
@@ -53,7 +54,7 @@
for QtCore). FILENAME_VAR specifies the name of a variable to store the path
to the generated file in.
-INCLUDE_INSTALL_DIR is the path (relative to ``CMAKE_INSTALL_PREFIX``) that
+INCLUDE_INSTALL_DIRS are the paths (relative to ``CMAKE_INSTALL_PREFIX``) that
include files will be installed to. It defaults to
``${INCLUDE_INSTALL_DIR}/<baseName>`` if the ``INCLUDE_INSTALL_DIR`` variable
is set. If that variable is not set, the ``CMAKE_INSTALL_INCLUDEDIR`` variable
@@ -61,6 +62,9 @@
operates similarly for the installation location for libraries; it defaults to
``${LIB_INSTALL_DIR}``, ``${CMAKE_INSTALL_LIBDIR}`` or ``lib``, in that order.
+INCLUDE_INSTALL_DIR is the old variant of INCLUDE_INSTALL_DIRS, taking only one
+directory.
+
Example usage:
.. code-block:: cmake
@@ -114,7 +118,7 @@
function(ECM_GENERATE_PRI_FILE)
set(options )
set(oneValueArgs BASE_NAME LIB_NAME DEPS FILENAME_VAR INCLUDE_INSTALL_DIR
LIB_INSTALL_DIR VERSION)
- set(multiValueArgs )
+ set(multiValueArgs INCLUDE_INSTALL_DIRS)
cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
@@ -145,13 +149,19 @@
endif()
endif()
endif()
- if(NOT EGPF_INCLUDE_INSTALL_DIR)
+ if(EGPF_INCLUDE_INSTALL_DIR)
+ if(EGPF_INCLUDE_INSTALL_DIRS)
+ message(FATAL_ERROR "Only one argument of INCLUDE_INSTALL_DIR &
INCLUDE_INSTALL_DIRS can be used in ECM_GENERATE_PRI_FILE() call")
+ endif()
+ set(EGPF_INCLUDE_INSTALL_DIRS ${EGPF_INCLUDE_INSTALL_DIR})
+ endif()
+ if(NOT EGPF_INCLUDE_INSTALL_DIRS)
if(INCLUDE_INSTALL_DIR)
- set(EGPF_INCLUDE_INSTALL_DIR
"${INCLUDE_INSTALL_DIR}/${EGPF_BASE_NAME}")
+ set(EGPF_INCLUDE_INSTALL_DIRS
"${INCLUDE_INSTALL_DIR}/${EGPF_BASE_NAME}")
elseif(CMAKE_INSTALL_INCLUDEDIR)
- set(EGPF_INCLUDE_INSTALL_DIR
"${CMAKE_INSTALL_INCLUDEDIR}/${EGPF_BASE_NAME}")
+ set(EGPF_INCLUDE_INSTALL_DIRS
"${CMAKE_INSTALL_INCLUDEDIR}/${EGPF_BASE_NAME}")
else()
- set(EGPF_INCLUDE_INSTALL_DIR "include/${EGPF_BASE_NAME}")
+ set(EGPF_INCLUDE_INSTALL_DIRS "include/${EGPF_BASE_NAME}")
endif()
endif()
if(NOT EGPF_LIB_INSTALL_DIR)
@@ -193,11 +203,15 @@
set(PRI_TARGET_BASENAME ${EGPF_BASE_NAME})
set(PRI_TARGET_LIBNAME ${EGPF_LIB_NAME})
set(PRI_TARGET_QTDEPS ${EGPF_DEPS})
- if(IS_ABSOLUTE "${EGPF_INCLUDE_INSTALL_DIR}")
- set(PRI_TARGET_INCLUDES "${EGPF_INCLUDE_INSTALL_DIR}")
- else()
- set(PRI_TARGET_INCLUDES "${BASEPATH}/${EGPF_INCLUDE_INSTALL_DIR}")
- endif()
+ set(PRI_TARGET_INCLUDES)
+ foreach(_dir ${EGPF_INCLUDE_INSTALL_DIRS})
+ # separate list entries with space
+ if(IS_ABSOLUTE "${_dir}")
+ string(APPEND PRI_TARGET_INCLUDES " ${_dir}")
+ else()
+ string(APPEND PRI_TARGET_INCLUDES " ${BASEPATH}/${_dir}")
+ endif()
+ endforeach()
if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}")
set(PRI_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}")
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/modules/ECMQmlModule.cmake
new/extra-cmake-modules-5.92.0/modules/ECMQmlModule.cmake
--- old/extra-cmake-modules-5.91.0/modules/ECMQmlModule.cmake 2022-02-05
16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/modules/ECMQmlModule.cmake 2022-02-27
21:48:24.000000000 +0100
@@ -12,7 +12,7 @@
care of special handling of QML modules between shared and static builds. When
building a static version of a QML module, the relevant QML source files are
bundled into the static library. When using a shared build, the QML plugin and
-relevant QML files are copied to the target's RUNTIME_OUTPUT_DIRECTORY to make
+relevant QML files are copied to the target's ``RUNTIME_OUTPUT_DIRECTORY`` to
make
it easier to run things directly from the build directory.
Example usage:
@@ -31,6 +31,7 @@
::
+
ecm_add_qml_module(<target name> URI <module uri> [VERSION <module
version>] [NO_PLUGIN] [CLASSNAME <class name>])
This will declare a new CMake target called ``<target name>``. The ``URI``
@@ -56,6 +57,7 @@
Since 5.91.0
::
+
ecm_add_qml_module_dependencies(<target> DEPENDS <module string> [<module
string> ...])
Add the list of dependencies specified by the ``DEPENDS`` argument to be listed
@@ -64,6 +66,7 @@
Since 5.91.0
::
+
ecm_target_qml_sources(<target> SOURCES <source.qml> [<source.qml> ...]
[VERSION <version>] [PATH <path>] [PRIVATE])
Add the list of QML files specified by the ``SOURCES`` argument as source files
@@ -86,6 +89,7 @@
Since 5.91.0
::
+
ecm_finalize_qml_module(<target> DESTINATION <QML install destination>)
Finalize the specified QML module target. This must be called after all other
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.91.0/toolchain/Android.cmake
new/extra-cmake-modules-5.92.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.91.0/toolchain/Android.cmake 2022-02-05
16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/toolchain/Android.cmake 2022-02-27
21:48:24.000000000 +0100
@@ -179,7 +179,11 @@
# armv7 really doesn't like mixing PIC/PIE code.
# Since we only have to care about a single compiler,
# hard-code the values here.
-if (NOT TARGET Threads::Threads)
+# Qt6 fixes this and breaks if we define Threads::Threads here.
+# We cannot use our usual Qt version check at this point though yet,
+# se check whether we are chainloaded by the Qt toolchain as an indicator
+# for Qt6.
+if (NOT TARGET Threads::Threads AND NOT DEFINED __qt_chainload_toolchain_file)
set(Threads_FOUND TRUE)
set(CMAKE_THREAD_LIBS_INIT "-pthread")
add_library(Threads::Threads INTERFACE IMPORTED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.91.0/toolchain/specifydependencies.cmake
new/extra-cmake-modules-5.92.0/toolchain/specifydependencies.cmake
--- old/extra-cmake-modules-5.91.0/toolchain/specifydependencies.cmake
2022-02-05 16:33:17.000000000 +0100
+++ new/extra-cmake-modules-5.92.0/toolchain/specifydependencies.cmake
2022-02-27 21:48:24.000000000 +0100
@@ -18,7 +18,7 @@
if(ourlib-${currentLib})
list(APPEND extralibs "${ourlib-${currentLib}}")
else()
- message(STATUS "could not find ${currentLib} in ${OUTPUT_DIR}
${EXPORT_DIR}/lib/ " ${ECM_ADDITIONAL_FIND_ROOT_PATH})
+ message(STATUS "could not find ${currentLib} in ${OUTPUT_DIR}
${EXPORT_DIR} ${ECM_ADDITIONAL_FIND_ROOT_PATH}")
endif()
endif()
endforeach()
