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-04-11 23:46:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon Apr 11 23:46:42 2022 rev:100 rq:968135 version:5.93.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2022-03-14 19:35:17.881999170 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1900/extra-cmake-modules.changes
2022-04-11 23:47:50.612030523 +0200
@@ -1,0 +2,33 @@
+Sun Apr 3 10:46:56 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.93.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.93.0
+- Changes since 5.92.0:
+ * Fix finding qmake
+ * ECMQueryQt: don't fail when TRY is used
+ * ECMQueryQt: Add fallbacks
+ * Require tests to pass for the CI to pass
+ * Fix unit tests for ECMAddTests for Qt6 after db2adb479
+ * ECMAddQch: Make it work with Qt6::qhelpgenerator too
+ * Deprecate ECMQueryQmake, superseded by ECMQueryQt
+ * KDEInstallDirs6: port from custom logic to ecm_query_qt
+ * Port from ECMQueryQmake to ECMQueryQt
+ * Android: use the current cmake executable
+ * Fix clang-format git hook script
+ * autotests: link to QtCore for WinMain on Windows
+ * autotests: tentative Windows fix
+ * Add ECMQueryQt module, which encompases both Qt5 Qmake
+ and Qt6 qtpaths
+ * KDEClangFormat: se the same source file extensions in
+ clang-format script and target
+ * generate-fastlane-metadata: Don't fail if source URL can
+ not be found
+ * Fix checking the repository name for detached remotes
+ * Android: Set CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+ * Check that you're building the framework in a supported
+ platform
+ * Android: autodetect the use of llvm
+
+-------------------------------------------------------------------
@@ -16,0 +50,6 @@
+
+-------------------------------------------------------------------
+Sat Feb 26 20:43:04 UTC 2022 - Dirk M??ller <[email protected]>
+
+- split off -doc subpackage into a _multibuild so that dependent
+ builds can start while Sphinx is not yet built.
Old:
----
extra-cmake-modules-5.92.0.tar.xz
extra-cmake-modules-5.92.0.tar.xz.sig
New:
----
_multibuild
extra-cmake-modules-5.93.0.tar.xz
extra-cmake-modules-5.93.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.RlmVbf/_old 2022-04-11 23:47:51.172024122 +0200
+++ /var/tmp/diff_new_pack.RlmVbf/_new 2022-04-11 23:47:51.180024031 +0200
@@ -16,7 +16,12 @@
#
-%define _tar_path 5.92
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "doc"
+%global pkg_suffix -doc
+%endif
+
+%define _tar_path 5.93
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -24,16 +29,16 @@
%bcond_without doc
# Only needed for the package signature condition
%bcond_without released
-Name: extra-cmake-modules
-Version: 5.92.0
+Name: extra-cmake-modules%{?pkg_suffix}
+Version: 5.93.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
URL: https://www.kde.org
-Source: %{name}-%{version}.tar.xz
+Source: extra-cmake-modules-%{version}.tar.xz
%if %{with released}
-Source1: %{name}-%{version}.tar.xz.sig
+Source1: extra-cmake-modules-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-OPENSUSE
@@ -41,35 +46,27 @@
BuildRequires: cmake >= 3.16
BuildRequires: gcc-c++
BuildRequires: kf5-filesystem
+%if "%{flavor}" != "doc"
Requires: cmake >= 3.16
Requires: gcc-c++
Requires: kf5-filesystem
-Recommends: %{name}-doc
+Recommends: extra-cmake-modules-doc
Provides: kf5umbrella = 4.99.0
Obsoletes: kf5umbrella < 4.99.0
-%if %{with doc}
+%else
BuildRequires: python3-Sphinx
%endif
-
-%description
-Extra modules and scripts for CMake.
-
-For more information see
https://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
-
-%package doc
-Summary: Documentation for extra-cmake-modules
-Group: Documentation/Other
-Requires: %{name} = %{version}
BuildArch: noarch
-%description doc
+%description
Extra modules and scripts for CMake.
+%if "%{flavor}" == "doc"
-For more information see
https://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
This package provides documentation for extra-cmake-modules
+%endif
%prep
-%autosetup -p1
+%autosetup -p1 -n extra-cmake-modules-%{version}
%build
%cmake_kf5 -d build
@@ -78,12 +75,15 @@
%install
%kf5_makeinstall -C build
+%if "%{flavor}" == "doc"
+rm -r %{buildroot}%{_datadir}/ECM
+%endif
+
%files
+%if "%{flavor}" != "doc"
%license LICENSES/*
%{_datadir}/ECM/
-
-%if %{with doc}
-%files doc
+%else
%doc %{_datadir}/doc/ECM/
%doc %lang(en) %{_mandir}/man7/ecm*.7*
%endif
++++++ _multibuild ++++++
<multibuild>
<flavor>doc</flavor>
</multibuild>
++++++ extra-cmake-modules-5.92.0.tar.xz -> extra-cmake-modules-5.93.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.92.0/.kde-ci.yml
new/extra-cmake-modules-5.93.0/.kde-ci.yml
--- old/extra-cmake-modules-5.92.0/.kde-ci.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/extra-cmake-modules-5.93.0/.kde-ci.yml 2022-03-30 15:04:06.000000000
+0200
@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Options:
+ require-passing-tests-on: [ 'Linux', 'FreeBSD' ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.92.0/CMakeLists.txt
new/extra-cmake-modules-5.93.0/CMakeLists.txt
--- old/extra-cmake-modules-5.92.0/CMakeLists.txt 2022-02-27
21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/CMakeLists.txt 2022-03-30
15:04:06.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.92.0") # handled by release scripts
+set(VERSION "5.93.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.92.0/docs/module/ECMQueryQt.rst
new/extra-cmake-modules-5.93.0/docs/module/ECMQueryQt.rst
--- old/extra-cmake-modules-5.92.0/docs/module/ECMQueryQt.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/docs/module/ECMQueryQt.rst 2022-03-30
15:04:06.000000000 +0200
@@ -0,0 +1 @@
+.. ecm-module:: ../../modules/ECMQueryQt.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/find-modules/FindQtWaylandScanner.cmake
new/extra-cmake-modules-5.93.0/find-modules/FindQtWaylandScanner.cmake
--- old/extra-cmake-modules-5.92.0/find-modules/FindQtWaylandScanner.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/find-modules/FindQtWaylandScanner.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -64,11 +64,11 @@
#]=======================================================================]
include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
ecm_find_package_version_check(QtWaylandScanner)
-query_qmake(qt_binaries_dir QT_HOST_BINS)
+ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
# Find qtwaylandscanner
find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS
${qt_binaries_dir})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.93.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.92.0/kde-modules/KDECMakeSettings.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/kde-modules/KDECMakeSettings.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -301,15 +301,19 @@
OUTPUT_VARIABLE upstream_ref
RESULT_VARIABLE exitCode
WORKING_DIRECTORY "${dir}")
- string(REGEX REPLACE "refs/remotes/([^/]+)/.*" "\\1" gitorigin
"${upstream_ref}")
if(exitCode EQUAL 0)
+ string(REGEX REPLACE "refs/remotes/([^/]+)/.*" "\\1" gitorigin
"${upstream_ref}")
message(DEBUG "Git upstream inferred as ${gitorigin}, upstream ref was
${upstream_ref}")
- execute_process(COMMAND git remote get-url --all "${gitorigin}"
- OUTPUT_VARIABLE giturl
- RESULT_VARIABLE exitCode
- WORKING_DIRECTORY "${dir}")
+ else()
+ set(gitorigin "origin")
+ message(DEBUG "Assuming origin as the git remote as we are in detached
mode")
endif()
+ execute_process(COMMAND git remote get-url --all "${gitorigin}"
+ OUTPUT_VARIABLE giturl
+ RESULT_VARIABLE exitCode
+ WORKING_DIRECTORY "${dir}")
+
if(exitCode EQUAL 0)
message(DEBUG "Git URL inferred as ${giturl}")
string(REGEX MATCHALL ".+kde\\.org[:\\/]([-A-Za-z0-9\\/]+)(.git)?\\s*"
"" ${giturl})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/KDEClangFormat.cmake
new/extra-cmake-modules-5.93.0/kde-modules/KDEClangFormat.cmake
--- old/extra-cmake-modules-5.92.0/kde-modules/KDEClangFormat.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/kde-modules/KDEClangFormat.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -35,7 +35,7 @@
.. code-block:: cmake
include(KDEClangFormat)
- file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
+ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.hpp *.c)
kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
To exclude directories from the formatting add a ``.clang-format``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/KDEFrameworkCompilerLegacySettings.cmake
new/extra-cmake-modules-5.93.0/kde-modules/KDEFrameworkCompilerLegacySettings.cmake
---
old/extra-cmake-modules-5.92.0/kde-modules/KDEFrameworkCompilerLegacySettings.cmake
2022-02-27 21:48:24.000000000 +0100
+++
new/extra-cmake-modules-5.93.0/kde-modules/KDEFrameworkCompilerLegacySettings.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -76,6 +76,6 @@
if (ECM_GLOBAL_FIND_VERSION VERSION_GREATER_EQUAL 5.80.0)
include(KDEClangFormat)
# add clang-format target
- file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
+ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.hpp *.c)
kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
endif ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.93.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.92.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2022-02-27 21:48:24.000000000 +0100
+++
new/extra-cmake-modules-5.93.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -64,5 +64,8 @@
# add clang-format target
include(KDEClangFormat)
-file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
+file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.hpp *.c)
kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+
+# add the metainfo platform check
+include(KDEMetaInfoPlatformCheck)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/KDEInstallDirs5.cmake
new/extra-cmake-modules-5.93.0/kde-modules/KDEInstallDirs5.cmake
--- old/extra-cmake-modules-5.92.0/kde-modules/KDEInstallDirs5.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/kde-modules/KDEInstallDirs5.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -231,11 +231,11 @@
set(KF5_LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_LIBEXECDIR_KF5}")
endif()
-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
- query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+ ecm_query_qt(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)
@@ -245,8 +245,8 @@
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}")
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)
+ ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+ ecm_query_qt(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})
@@ -255,7 +255,7 @@
"Qt plugins"
QT_PLUGIN_INSTALL_DIR)
- query_qmake(qt_imports_dir QT_INSTALL_IMPORTS)
+ ecm_query_qt(qt_imports_dir QT_INSTALL_IMPORTS)
if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
file(RELATIVE_PATH qt_imports_dir ${qt_install_prefix_dir}
${qt_imports_dir})
@@ -264,7 +264,7 @@
"QtQuick1 imports"
IMPORTS_INSTALL_DIR)
- query_qmake(qt_qml_dir QT_INSTALL_QML)
+ ecm_query_qt(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})
@@ -308,7 +308,7 @@
# Qt-specific data vars
if(KDE_INSTALL_USE_QT_SYS_PATHS)
- query_qmake(qt_docs_dir QT_INSTALL_DOCS)
+ ecm_query_qt(qt_docs_dir QT_INSTALL_DOCS)
_define_absolute(QTQCHDIR ${qt_docs_dir}
"documentation bundles in QCH format for Qt-extending libraries")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/KDEInstallDirs6.cmake
new/extra-cmake-modules-5.93.0/kde-modules/KDEInstallDirs6.cmake
--- old/extra-cmake-modules-5.92.0/kde-modules/KDEInstallDirs6.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/kde-modules/KDEInstallDirs6.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -197,9 +197,8 @@
_define_non_cache(LIBEXECDIR_KF "${CMAKE_INSTALL_LIBEXECDIR}/kf6")
endif()
-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)
+include(${ECM_MODULE_DIR}/ECMQueryQt.cmake)
+ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX)
set(_qt_prefix_is_cmake_install_prefix FALSE)
if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
@@ -221,13 +220,13 @@
if(KDE_INSTALL_USE_QT_SYS_PATHS)
# Qt-specific vars
- execute_process(COMMAND ${qtpaths_executable} --query QT_INSTALL_PLUGINS
OUTPUT_VARIABLE qt_plugins_dir)
+ ecm_query_qt(qt_plugins_dir QT_INSTALL_PLUGINS)
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)
+ ecm_query_qt(qt_qml_dir QT_INSTALL_QML)
if(_qt_prefix_is_cmake_install_prefix)
file(RELATIVE_PATH qt_qml_dir ${qt_install_prefix_dir} ${qt_qml_dir})
endif()
@@ -254,7 +253,7 @@
# Qt-specific data vars
if(KDE_INSTALL_USE_QT_SYS_PATHS)
- execute_process(COMMAND ${qtpaths_executable} --query QT_INSTALL_DOCS
OUTPUT_VARIABLE qt_docs_dir)
+ ecm_query_qt(qt_docs_dir QT_INSTALL_DOCS)
_define_absolute(QTQCHDIR ${qt_docs_dir} "documentation bundles in QCH
format for Qt-extending libraries")
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
new/extra-cmake-modules-5.93.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
--- old/extra-cmake-modules-5.92.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/kde-modules/KDEMetaInfoPlatformCheck.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -0,0 +1,71 @@
+# SPDX-FileCopyrightText: 2022 Albert Astals Cid <[email protected]>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+KDEMetaInfoPlatformCheck
+--------------------
+
+By including this module there will be an automatic check between the supported
+platforms listed in the metainfo.yaml file and the current platform
+that is the target of the build
+
+If the current platform that is the target of the build is not supported
+a cmake FATAL_ERROR will be issued
+
+The check can be ignored by setting KF_IGNORE_PLATFORM_CHECK to ON
+
+Since 5.93
+#]=======================================================================]
+
+option(KF_IGNORE_PLATFORM_CHECK "Ignore the supported platform check against
metainfo.yaml" OFF)
+
+if (NOT "${KF_IGNORE_PLATFORM_CHECK}")
+ file(STRINGS metainfo.yaml MetaInfoContents)
+ set(_MetainfoParserInPlatforms false)
+ set(_MetainfoFoundSupportedPlatform false)
+ set(_MetainfoSupportedPlatforms "")
+ foreach(MetaInfoString IN LISTS MetaInfoContents)
+ if ("${MetaInfoString}" STREQUAL "platforms:")
+ set(_MetainfoParserInPlatforms true)
+ elseif(_MetainfoParserInPlatforms AND "${MetaInfoString}" MATCHES
".*name:[ \t\r\n]*(.*)")
+ list(APPEND _MetainfoSupportedPlatforms ${CMAKE_MATCH_1})
+ if (${CMAKE_MATCH_1} STREQUAL "Linux")
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ set(_MetainfoFoundSupportedPlatform true)
+ endif()
+ elseif (${CMAKE_MATCH_1} STREQUAL "FreeBSD")
+ if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ set(_MetainfoFoundSupportedPlatform true)
+ endif()
+ elseif (${CMAKE_MATCH_1} STREQUAL "Windows")
+ if (WIN32)
+ set(_MetainfoFoundSupportedPlatform true)
+ endif()
+ elseif (${CMAKE_MATCH_1} STREQUAL "macOS")
+ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ set(_MetainfoFoundSupportedPlatform true)
+ endif()
+ elseif (${CMAKE_MATCH_1} STREQUAL "Android")
+ if (ANDROID)
+ set(_MetainfoFoundSupportedPlatform true)
+ endif()
+ elseif (${CMAKE_MATCH_1} STREQUAL "iOS")
+ if (IOS)
+ set(_MetainfoFoundSupportedPlatform true)
+ endif()
+ elseif (${CMAKE_MATCH_1} STREQUAL "All")
+ set(_MetainfoFoundSupportedPlatform true)
+ else()
+ list(POP_BACK _MetainfoSupportedPlatforms)
+ message(WARNING "Found platform not recognized by the metainfo
platform parser: ${CMAKE_MATCH_1}")
+ endif()
+ elseif("${MetaInfoString}" MATCHES "^[A-Za-z0-9_]+:")
+ set(_MetainfoParserInPlatforms false)
+ endif()
+ endforeach()
+
+ if (NOT _MetainfoFoundSupportedPlatform)
+ message(FATAL_ERROR "Your current platform '${CMAKE_SYSTEM_NAME}' is
not supported. The list of supported platorms is
'${_MetainfoSupportedPlatforms}'.If you think this is a mistake or you are
working on enabling the platform please build with the KF_IGNORE_PLATFORM_CHECK
variable set to true")
+ endif()
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/kde-modules/kde-git-commit-hooks/clang-format.sh
new/extra-cmake-modules-5.93.0/kde-modules/kde-git-commit-hooks/clang-format.sh
---
old/extra-cmake-modules-5.92.0/kde-modules/kde-git-commit-hooks/clang-format.sh
2022-02-27 21:48:24.000000000 +0100
+++
new/extra-cmake-modules-5.93.0/kde-modules/kde-git-commit-hooks/clang-format.sh
2022-03-30 15:04:06.000000000 +0200
@@ -2,7 +2,7 @@
# Based on okular/hooks/pre-commit, credits go to Albert Astals Cid
-readonly output=$(git clang-format -v --diff)
+readonly output=$(git clang-format --extensions 'cpp,h,hpp,c' -v --diff)
if [[ ! -f .clang-format ]]; then
echo "ERROR: no .clang-format file found in repository root, abort format"
@@ -13,6 +13,6 @@
if [[ "$output" == *"clang-format did not modify any files"* ]]; then exit 0;
fi
echo "ERROR: You have unformatted changes, please format your files. You can
do this using the following commands:"
-echo " git clang-format --force # format the changed parts"
-echo " git clang-format --diff # preview the changes done by the
formatter"
+echo " git clang-format --extensions 'cpp,h,hpp,c' --force # format the
changed parts"
+echo " git clang-format --extensions 'cpp,h,hpp,c' --diff # preview the
changes done by the formatter"
exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.92.0/modules/ECMAddQch.cmake
new/extra-cmake-modules-5.93.0/modules/ECMAddQch.cmake
--- old/extra-cmake-modules-5.92.0/modules/ECMAddQch.cmake 2022-02-27
21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/modules/ECMAddQch.cmake 2022-03-30
15:04:06.000000000 +0200
@@ -258,7 +258,7 @@
include(CMakeParseArguments)
include(${CMAKE_CURRENT_LIST_DIR}/../modules/QtVersionOption.cmake)
-include(ECMQueryQmake)
+include(ECMQueryQt)
# Helper method: adding the LINK_QCHS property to a Qt QCH targets, from
module base names ("Core" etc.)
@@ -282,7 +282,7 @@
# get Qt version, if any
find_package(Qt${QT_MAJOR_VERSION}Core CONFIG QUIET)
# lookup tag files
- query_qmake(qt_docs_dir QT_INSTALL_DOCS TRY)
+ ecm_query_qt(qt_docs_dir QT_INSTALL_DOCS TRY)
find_path(_qtcoreTagsPath qtcore/qtcore.tags
PATHS
${qt_docs_dir}
@@ -427,17 +427,31 @@
TYPE REQUIRED
PURPOSE "Needed for API dox QCH file
generation${doxygen_description_addition}"
)
- find_package(QHelpGenerator REQUIRED)
- set_package_properties(QHelpGenerator PROPERTIES
- TYPE REQUIRED
- PURPOSE "Needed for API dox QCH file generation"
- DESCRIPTION "Part of Qt5 tools"
- )
+
+ if (QT_MAJOR_VERSION EQUAL "5")
+ find_package(QHelpGenerator REQUIRED)
+ set_package_properties(QHelpGenerator PROPERTIES
+ TYPE REQUIRED
+ PURPOSE "Needed for API dox QCH file generation"
+ DESCRIPTION "Part of Qt5 tools"
+ )
+ else()
+ find_package(Qt6 COMPONENTS ToolsTools CONFIG REQUIRED)
+ set_package_properties(Qt6ToolsTools PROPERTIES
+ TYPE REQUIRED
+ PURPOSE "Needed for API dox QCH file generation"
+ DESCRIPTION "qhelpgenerator from Qt6 tools"
+ )
+ if(TARGET Qt6::qhelpgenerator)
+ get_target_property(QHelpGenerator_EXECUTABLE Qt6::qhelpgenerator
LOCATION)
+ endif()
+ endif()
+
set(_missing_tools)
if (NOT DOXYGEN_FOUND)
list(APPEND _missing_tools "Doxygen")
endif()
- if (NOT QHelpGenerator_FOUND)
+ if (NOT QHelpGenerator_FOUND AND NOT TARGET Qt6::qhelpgenerator)
list(APPEND _missing_tools "qhelpgenerator")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/modules/ECMFindQmlModule.cmake.in
new/extra-cmake-modules-5.93.0/modules/ECMFindQmlModule.cmake.in
--- old/extra-cmake-modules-5.92.0/modules/ECMFindQmlModule.cmake.in
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/modules/ECMFindQmlModule.cmake.in
2022-03-30 15:04:06.000000000 +0200
@@ -8,8 +8,8 @@
include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
if (QT_MAJOR_VERSION EQUAL "5")
- include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
- query_qmake(qt_binaries_dir QT_HOST_BINS)
+ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
+ ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS
${qt_binaries_dir})
elseif (QT_MAJOR_VERSION EQUAL "6")
find_package(Qt6 COMPONENTS QmlTools REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-5.93.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-5.92.0/modules/ECMGeneratePriFile.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/modules/ECMGeneratePriFile.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -89,19 +89,19 @@
# Replicate the logic from KDEInstallDirs.cmake as we can't depend on it
# Ask qmake if we're using the same prefix as Qt
-set(_askqmake OFF)
+set(_should_query_qt OFF)
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
- include(ECMQueryQmake)
- query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+ include(ECMQueryQt)
+ ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
- set(_askqmake ON)
+ set(_should_query_qt ON)
endif()
endif()
-if(KDE_INSTALL_USE_QT_SYS_PATHS OR _askqmake)
- include(ECMQueryQmake)
- query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX)
- query_qmake(qt_host_data_dir QT_HOST_DATA)
+if(KDE_INSTALL_USE_QT_SYS_PATHS OR _should_query_qt)
+ include(ECMQueryQt)
+ ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX)
+ ecm_query_qt(qt_host_data_dir QT_HOST_DATA)
if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
file(RELATIVE_PATH qt_host_data_dir ${qt_install_prefix_dir}
${qt_host_data_dir})
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/modules/ECMQueryQmake.cmake
new/extra-cmake-modules-5.93.0/modules/ECMQueryQmake.cmake
--- old/extra-cmake-modules-5.92.0/modules/ECMQueryQmake.cmake 2022-02-27
21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/modules/ECMQueryQmake.cmake 2022-03-30
15:04:06.000000000 +0200
@@ -1,3 +1,7 @@
+if (${ECM_GLOBAL_FIND_VERSION} VERSION_GREATER_EQUAL 5.93)
+ message(DEPRECATION "ECMQueryQmake.cmake is deprecated since 5.93, please
use ECMQueryQt.cmake instead.")
+endif()
+
include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake)
find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.92.0/modules/ECMQueryQt.cmake
new/extra-cmake-modules-5.93.0/modules/ECMQueryQt.cmake
--- old/extra-cmake-modules-5.92.0/modules/ECMQueryQt.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/modules/ECMQueryQt.cmake 2022-03-30
15:04:06.000000000 +0200
@@ -0,0 +1,99 @@
+# SPDX-FileCopyrightText: 2014 Rohan Garg <[email protected]>
+# SPDX-FileCopyrightText: 2014 Alex Merry <[email protected]>
+# SPDX-FileCopyrightText: 2014-2016 Aleix Pol <[email protected]>
+# SPDX-FileCopyrightText: 2017 Friedrich W. H. Kossebau <[email protected]>
+# SPDX-FileCopyrightText: 2022 Ahmad Samir <[email protected]>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#[=======================================================================[.rst:
+ECMQueryQt
+---------------
+This module can be used to query the installation paths used by Qt.
+
+For Qt5 this uses ``qmake``, and for Qt6 this used ``qtpaths`` (the latter has
built-in
+support to query the paths of a target platform when cross-compiling).
+
+This module defines the following function:
+::
+
+ ecm_query_qt(<result_variable> <qt_variable> [TRY])
+
+Passing ``TRY`` will result in the method not making the build fail if the
executable
+used for querying has not been found, but instead simply print a warning
message and
+return an empty string.
+
+Example usage:
+
+.. code-block:: cmake
+
+ include(ECMQueryQt)
+ ecm_query_qt(bin_dir QT_INSTALL_BINS)
+
+If the call succeeds ``${bin_dir}`` will be set to
``<prefix>/path/to/bin/dir`` (e.g.
+``/usr/lib64/qt/bin/``).
+
+Since: 5.93
+#]=======================================================================]
+
+include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake)
+
+if (QT_MAJOR_VERSION STREQUAL "5")
+ find_program(_qmake_executable_default NAMES qmake qmake-qt5 qmake5)
+ if(NOT _qmake_executable_default)
+ # Enable the CXX language to let CMake look for config files
+ # into library dirs
+ enable_language(CXX)
+ find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
+ if(TARGET Qt5::qmake)
+ get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
+ endif()
+ endif()
+ set(QUERY_EXECUTABLE ${_qmake_executable_default}
+ CACHE FILEPATH "Location of the Qt5 qmake executable")
+ set(_exec_name_text "Qt5 qmake")
+ set(_cli_option "-query")
+elseif(QT_MAJOR_VERSION STREQUAL "6")
+ find_program(_qtpaths_executable NAMES qtpaths6)
+ if(NOT _qtpaths_executable)
+ enable_language(CXX)
+ find_package(Qt6 COMPONENTS CoreTools QUIET CONFIG)
+ if (TARGET Qt6::qtpaths)
+ get_target_property(_qtpaths_executable Qt6::qtpaths LOCATION)
+ endif()
+ endif()
+ set(QUERY_EXECUTABLE ${_qtpaths_executable}
+ CACHE FILEPATH "Location of the Qt6 qtpaths executable")
+ set(_exec_name_text "Qt6 qtpaths")
+ set(_cli_option "--query")
+endif()
+
+function(ecm_query_qt result_variable qt_variable)
+ set(options TRY)
+ set(oneValueArgs)
+ set(multiValueArgs)
+
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
+
+ if(NOT QUERY_EXECUTABLE)
+ if(ARGS_TRY)
+ set(${result_variable} "" PARENT_SCOPE)
+ message(STATUS "No ${_exec_name_text} executable found. Can't
check ${qt_variable}")
+ return()
+ else()
+ message(FATAL_ERROR "No ${_exec_name_text} executable found. Can't
check ${qt_variable} as required")
+ endif()
+ endif()
+ execute_process(
+ COMMAND ${QUERY_EXECUTABLE} ${_cli_option} "${qt_variable}"
+ RESULT_VARIABLE return_code
+ OUTPUT_VARIABLE output
+ )
+ if(return_code EQUAL 0)
+ string(STRIP "${output}" output)
+ file(TO_CMAKE_PATH "${output}" output_path)
+ set(${result_variable} "${output_path}" PARENT_SCOPE)
+ else()
+ message(WARNING "Failed call: ${_command} \"${qt_variable}\"")
+ message(FATAL_ERROR "${_exec_name_text} call failed: ${return_code}")
+ endif()
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/tests/ECMAddTests/CMakeLists.txt
new/extra-cmake-modules-5.93.0/tests/ECMAddTests/CMakeLists.txt
--- old/extra-cmake-modules-5.92.0/tests/ECMAddTests/CMakeLists.txt
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/tests/ECMAddTests/CMakeLists.txt
2022-03-30 15:04:06.000000000 +0200
@@ -1,3 +1,9 @@
+if (QT_MAJOR_VERSION EQUAL "6")
+ set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON")
+else()
+ set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
+endif()
+
macro(add_check NAME)
string(REPLACE "." "/" dir "${NAME}")
string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
@@ -12,7 +18,7 @@
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-project ${proj}
- --build-options -DBUILD_TESTING:BOOL=ON
+ --build-options -DBUILD_TESTING:BOOL=ON ${QT_VERSION_OPT}
${${NAME}_EXTRA_OPTIONS}
--test-command "${CMAKE_CTEST_COMMAND}"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/tests/ECMAddTests/multi_tests/CMakeLists.txt
new/extra-cmake-modules-5.93.0/tests/ECMAddTests/multi_tests/CMakeLists.txt
--- old/extra-cmake-modules-5.92.0/tests/ECMAddTests/multi_tests/CMakeLists.txt
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/tests/ECMAddTests/multi_tests/CMakeLists.txt
2022-03-30 15:04:06.000000000 +0200
@@ -7,6 +7,11 @@
add_library(testhelper STATIC ../testhelper.cpp)
target_include_directories(testhelper PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
+# Link to QtCore for WinMain on Windows
+include(QtVersionOption)
+find_package(Qt${QT_MAJOR_VERSION}Core REQUIRED)
+target_link_libraries(testhelper PUBLIC Qt${QT_MAJOR_VERSION}::Core)
+
enable_testing()
include(ECMAddTests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/tests/ECMAddTests/single_tests/CMakeLists.txt
new/extra-cmake-modules-5.93.0/tests/ECMAddTests/single_tests/CMakeLists.txt
---
old/extra-cmake-modules-5.92.0/tests/ECMAddTests/single_tests/CMakeLists.txt
2022-02-27 21:48:24.000000000 +0100
+++
new/extra-cmake-modules-5.93.0/tests/ECMAddTests/single_tests/CMakeLists.txt
2022-03-30 15:04:06.000000000 +0200
@@ -7,6 +7,11 @@
add_library(testhelper STATIC ../testhelper.cpp)
target_include_directories(testhelper PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
+# Link to QtCore for WinMain on Windows
+include(QtVersionOption)
+find_package(Qt${QT_MAJOR_VERSION}Core REQUIRED)
+target_link_libraries(testhelper PUBLIC Qt${QT_MAJOR_VERSION}::Core)
+
enable_testing()
include(ECMAddTests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/tests/ECMQmlModuleTest/check.cmake.in
new/extra-cmake-modules-5.93.0/tests/ECMQmlModuleTest/check.cmake.in
--- old/extra-cmake-modules-5.92.0/tests/ECMQmlModuleTest/check.cmake.in
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/tests/ECMQmlModuleTest/check.cmake.in
2022-03-30 15:04:06.000000000 +0200
@@ -38,7 +38,11 @@
)
if (NOT QML_ONLY AND NOT DEPENDS)
- check_file_exists("${INSTALL_DIR}/Test/libTestModule.so")
+ if (WIN32)
+ check_file_exists("${INSTALL_DIR}/Test/TestModule.dll")
+ else()
+ check_file_exists("${INSTALL_DIR}/Test/libTestModule.so")
+ endif()
check_file_contents(
GENERATED "${INSTALL_DIR}/Test/qmldir"
@@ -60,5 +64,9 @@
)
endif()
else()
- check_file_exists("${INSTALL_DIR}/Test/libTestModule.a")
+ if (WIN32)
+ check_file_exists("${INSTALL_DIR}/Test/TestModule.lib")
+ else()
+ check_file_exists("${INSTALL_DIR}/Test/libTestModule.a")
+ endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.92.0/toolchain/Android.cmake
new/extra-cmake-modules-5.93.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.92.0/toolchain/Android.cmake 2022-02-27
21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/toolchain/Android.cmake 2022-03-30
15:04:06.000000000 +0200
@@ -196,6 +196,17 @@
set(ANDROID_STL ${CMAKE_ANDROID_STL_TYPE})
include(${CMAKE_ANDROID_NDK}/build/cmake/android.toolchain.cmake REQUIRED)
+# Export configurable variables for the try_compile() command.
+list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+ CMAKE_ANDROID_NDK
+ CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
+ CMAKE_ANDROID_API
+ CMAKE_ANDROID_ARCH
+ CMAKE_ANDROID_ARCH_ABI
+ ANDROID_SDK_ROOT
+ ANDROID_SDK_COMPILE_API
+)
+
## HACK: Remove when we can depend on NDK r23
# Workaround issue https://github.com/android/ndk/issues/929
if(ANDROID_NDK_MAJOR VERSION_LESS 23)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.93.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.92.0/toolchain/ECMAndroidDeployQt.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/toolchain/ECMAndroidDeployQt.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -109,12 +109,12 @@
set(CREATEAPK_TARGET_NAME "create-apk-${QTANDROID_EXPORTED_TARGET}")
add_custom_target(${CREATEAPK_TARGET_NAME}
- COMMAND cmake -E echo "Generating
$<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with
$<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt"
- COMMAND cmake -E remove_directory "${EXPORT_DIR}"
- COMMAND cmake -E copy_directory
"$<TARGET_PROPERTY:create-apk-${QTANDROID_EXPORTED_TARGET},ANDROID_APK_DIR>"
"${EXPORT_DIR}"
- COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
- COMMAND LANG=C cmake
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" -P
${_CMAKE_ANDROID_DIR}/hasMainSymbol.cmake
- COMMAND LANG=C cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in2"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"-DOUTPUT_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}"
"-DECM_ADDITIONAL_FIND_ROOT_PATH=\"${ECM_ADDITIONAL_FIND_ROOT_PATH}\""
"-DANDROID_EXTRA_LIBS=\"${ANDROID_EXTRA_LIBS}\"" "-DUSE_LLVM=\"${USE_LLVM}\""
-P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
+ COMMAND ${CMAKE_COMMAND} -E echo "Generating
$<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with
$<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt"
+ COMMAND ${CMAKE_COMMAND} -E remove_directory "${EXPORT_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
"$<TARGET_PROPERTY:create-apk-${QTANDROID_EXPORTED_TARGET},ANDROID_APK_DIR>"
"${EXPORT_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E copy
"$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" "${EXECUTABLE_DESTINATION_PATH}"
+ COMMAND LANG=C ${CMAKE_COMMAND}
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" -P
${_CMAKE_ANDROID_DIR}/hasMainSymbol.cmake
+ COMMAND LANG=C ${CMAKE_COMMAND}
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in2"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET=$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"-DOUTPUT_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}"
"-DECM_ADDITIONAL_FIND_ROOT_PATH=\"${ECM_ADDITIONAL_FIND_ROOT_PATH}\""
"-DANDROID_EXTRA_LIBS=\"${ANDROID_EXTRA_LIBS}\"" "-DUSE_LLVM=\"${USE_LLVM}\""
-P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt
${ANDROIDDEPLOYQT_EXTRA_ARGS} --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --apk
"${ANDROID_APK_OUTPUT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk"
--output "${EXPORT_DIR}" --android-platform android-${ANDROID_SDK_COMPILE_API}
--deployment bundled ${arguments}
)
# --android-platform above is only available as a command line option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/toolchain/generate-fastlane-metadata.py
new/extra-cmake-modules-5.93.0/toolchain/generate-fastlane-metadata.py
--- old/extra-cmake-modules-5.92.0/toolchain/generate-fastlane-metadata.py
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/toolchain/generate-fastlane-metadata.py
2022-03-30 15:04:06.000000000 +0200
@@ -341,9 +341,8 @@
if arguments.source and os.path.exists(os.path.join(arguments.source,
'.git')):
upstream_ref = subprocess.check_output(['git', 'rev-parse',
'--symbolic-full-name', '@{u}'], cwd=arguments.source).decode('utf-8')
remote = upstream_ref.split('/')[2]
- output = subprocess.check_output(['git', 'remote', 'show', '-n',
remote], cwd=arguments.source).decode('utf-8')
- result = re.search(' Fetch URL: (.*)\n', output)
- data['source-repo'] = result.group(1)
+ output = subprocess.check_output(['git', 'remote', 'get-url', remote],
cwd=arguments.source).decode('utf-8')
+ data['source-repo'] = output.strip()
# write meta data
createFastlaneFile( applicationName, "title.txt", data['name'] )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.92.0/toolchain/specifydependencies.cmake
new/extra-cmake-modules-5.93.0/toolchain/specifydependencies.cmake
--- old/extra-cmake-modules-5.92.0/toolchain/specifydependencies.cmake
2022-02-27 21:48:24.000000000 +0100
+++ new/extra-cmake-modules-5.93.0/toolchain/specifydependencies.cmake
2022-03-30 15:04:06.000000000 +0200
@@ -83,13 +83,16 @@
file(READ "stl" stl_contents)
file(READ "ranlib" ranlib_contents)
-string(REGEX MATCH ".+/toolchains/(.+)-([^\\-]+)/prebuilt/.*/bin/(.*)-ranlib"
x ${ranlib_contents})
-
+string(REGEX MATCH ".+/toolchains/llvm/prebuilt/.+/bin/(.+)-ranlib" USE_LLVM
${ranlib_contents})
if (USE_LLVM)
string(REPLACE "##ANDROID_TOOL_PREFIX##" "llvm" NEWCONTENTS "${CONTENTS}")
- string(REPLACE "##ANDROID_COMPILER_PREFIX##" "llvm" NEWCONTENTS
"${NEWCONTENTS}")
+ string(REPLACE "##ANDROID_COMPILER_PREFIX##" "${CMAKE_MATCH_1}" NEWCONTENTS
"${NEWCONTENTS}")
string(REPLACE "##USE_LLVM##" true NEWCONTENTS "${NEWCONTENTS}")
else()
+ string(REGEX MATCH
".+/toolchains/(.+)-([^\\-]+)/prebuilt/.+/bin/(.+)-ranlib" RANLIB_PATH_MATCH
${ranlib_contents})
+ if (NOT RANLIB_PATH_MATCH)
+ message(FATAL_ERROR "Couldn't parse the components of the path to
${ranlib_contents}")
+ endif()
string(REPLACE "##ANDROID_TOOL_PREFIX##" "${CMAKE_MATCH_1}" NEWCONTENTS
"${CONTENTS}")
string(REPLACE "##ANDROID_COMPILER_PREFIX##" "${CMAKE_MATCH_3}" NEWCONTENTS
"${NEWCONTENTS}")
string(REPLACE "##USE_LLVM##" false NEWCONTENTS "${NEWCONTENTS}")
