Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2017-08-24 17:53:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Thu Aug 24 17:53:08 2017 rev:44 rq:516652 version:5.37.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2017-07-17 10:27:13.616930560 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2017-08-24 17:55:35.629424788 +0200
@@ -1,0 +2,20 @@
+Sat Aug 12 09:23:14 UTC 2017 - [email protected]
+
+- Update to 5.37.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.37.0.php
+- Changes since 5.36.0 :
+ * Add --gradle to androiddeployqt
+ * Fix install apk target
+ * Make ECMPoQmToolsTest actually fail if a translation is wrong
+ * Fix usage of query_qmake: differ between calls expecting qmake or not
+ * Add API dox for KDEInstallDirs' KDE_INSTALL_USE_QT_SYS_PATHS
+ * KDECompilerSettings.cmake - handle Cywgin when setting LINK_FLAGS
+ * Fix incomplete default path noted in QTQCHDIR documentation
+ * Properly point at ECM
+ * add a metainfo.yaml to make ECM a proper framework
+ * Android: scan for qml files in the source dir, not in the install dir.
+ * Stabilize ECMQtDeclareLoggingCategoryTest
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.36.0.tar.xz
New:
----
extra-cmake-modules-5.37.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.d39wMb/_old 2017-08-24 17:55:36.273334094 +0200
+++ /var/tmp/diff_new_pack.d39wMb/_new 2017-08-24 17:55:36.281332967 +0200
@@ -16,13 +16,13 @@
#
-%define _tar_path 5.36
+%define _tar_path 5.37
Name: extra-cmake-modules
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
Url:
https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-Version: 5.36.0
+Version: 5.37.0
Release: 0
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
++++++ extra-cmake-modules-5.36.0.tar.xz -> extra-cmake-modules-5.37.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.36.0/CMakeLists.txt
new/extra-cmake-modules-5.37.0/CMakeLists.txt
--- old/extra-cmake-modules-5.36.0/CMakeLists.txt 2017-06-23
17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/CMakeLists.txt 2017-08-02
20:41:22.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.36.0") # handled by release scripts
+set(VERSION "5.37.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.36.0/README.md
new/extra-cmake-modules-5.37.0/README.md
--- old/extra-cmake-modules-5.36.0/README.md 1970-01-01 01:00:00.000000000
+0100
+++ new/extra-cmake-modules-5.37.0/README.md 2017-08-02 20:41:22.000000000
+0200
@@ -0,0 +1,17 @@
+# Extra CMake Modules
+
+## Introduction
+
+The Extra CMake Modules package, or ECM, adds to the modules provided by CMake,
+including ones used by ``find_package()`` to find common software, ones that
+can be used directly in ``CMakeLists.txt`` files to perform common tasks and
+toolchain files that must be specified on the commandline by the user.
+
+In addition, it provides common build settings used in software produced by the
+KDE community.
+
+While the driving force of this module is to reduce duplication in CMake
scripts
+across KDE software, it is intended to be useful for any software that uses the
+CMake build system.
+
+For more information visit the documentation at https://api.kde.org/ecm/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.36.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-5.37.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-5.36.0/kde-modules/KDECompilerSettings.cmake
2017-06-23 17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/kde-modules/KDECompilerSettings.cmake
2017-08-02 20:41:22.000000000 +0200
@@ -229,7 +229,7 @@
cmake_policy(SET CMP0063 NEW)
endif()
-if (UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE AND NOT CYGWIN)
# Enable adding DT_RUNPATH, which means that LD_LIBRARY_PATH takes
precedence
# over the built-in rPath
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags
${CMAKE_SHARED_LINKER_FLAGS}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.36.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-5.37.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-5.36.0/kde-modules/KDEInstallDirs.cmake
2017-06-23 17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/kde-modules/KDEInstallDirs.cmake
2017-08-02 20:41:22.000000000 +0200
@@ -35,13 +35,13 @@
# CMake packages, including config files (``LIBDIR/cmake``)
# [``CMAKECONFIG_INSTALL_PREFIX``]
# ``QTPLUGINDIR``
-# Qt plugins (``LIBDIR/plugins``) [``QT_PLUGIN_INSTALL_DIR``]
+# Qt plugins (``LIBDIR/plugins`` or qmake-qt5's ``QT_INSTALL_PLUGINS``)
[``QT_PLUGIN_INSTALL_DIR``]
# ``PLUGINDIR``
# Plugins (``QTPLUGINDIR``) [``PLUGIN_INSTALL_DIR``]
# ``QTQUICKIMPORTSDIR``
-# QtQuick1 imports (``QTPLUGINDIR/imports``) [``IMPORTS_INSTALL_DIR``]
+# QtQuick1 imports (``QTPLUGINDIR/imports`` or qmake-qt5's
``QT_INSTALL_IMPORTS``) [``IMPORTS_INSTALL_DIR``]
# ``QMLDIR``
-# QtQuick2 imports (``LIBDIR/qml``) [``QML_INSTALL_DIR``]
+# QtQuick2 imports (``LIBDIR/qml`` or qmake-qt5's ``QT_INSTALL_QML``)
[``QML_INSTALL_DIR``]
# ``INCLUDEDIR``
# C and C++ header files (``include``) [``INCLUDE_INSTALL_DIR``]
# ``LOCALSTATEDIR``
@@ -101,7 +101,7 @@
# ``METAINFODIR``
# AppStream component metadata files (``DATAROOTDIR/metainfo``)
# ``QTQCHDIR``
-# documentation bundles in QCH format for Qt-extending libraries
(``DATAROOTDIR/doc``) Since 5.36.0.
+# documentation bundles in QCH format for Qt-extending libraries
(``DATAROOTDIR/doc/qch`` or qmake-qt5's ``QT_INSTALL_DOCS``) Since 5.36.0.
# ``QCHDIR``
# documentation bundles in QCH format (``DATAROOTDIR/doc/qch``) Since
5.36.0.
# ``MANDIR``
@@ -129,6 +129,16 @@
# ``AUTOSTARTDIR``
# autostart files (``CONFDIR/autostart``) [``AUTOSTART_INSTALL_DIR``]
#
+# 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
+# Qt5's qmake (where mentioned in the parentheses above).
+# If not set, it will default to TRUE if Qt5's qmake is found and
+# it's ``QT_INSTALL_PREFIX`` is the same as ``CMAKE_INSTALL_PREFIX``,
+# otherwise default to FALSE.
+# This variable should NOT be set from within CMakeLists.txt files, instead
+# is intended to be set manually when configuring a project which uses
+# KDEInstallDirs (e.g. by packagers).
+#
# If ``KDE_INSTALL_DIRS_NO_DEPRECATED`` is set to TRUE before including this
# module, the deprecated variables (listed in the square brackets above) are
# not defined.
@@ -445,7 +455,7 @@
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)
+ 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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.36.0/metainfo.yaml
new/extra-cmake-modules-5.37.0/metainfo.yaml
--- old/extra-cmake-modules-5.36.0/metainfo.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.37.0/metainfo.yaml 2017-08-02
20:41:22.000000000 +0200
@@ -0,0 +1,18 @@
+maintainer: skelly
+description: Extra CMake modules
+tier: 1
+type: functional
+platforms:
+ - name: Linux
+ - name: FreeBSD
+ - name: Windows
+ - name: MacOSX
+ - name: Android
+portingAid: false
+deprecated: false
+release: true
+cmakename: ECM
+
+public_lib: true
+group: Frameworks
+subgroup: Tier 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.36.0/modules/ECMAddQch.cmake
new/extra-cmake-modules-5.37.0/modules/ECMAddQch.cmake
--- old/extra-cmake-modules-5.36.0/modules/ECMAddQch.cmake 2017-06-23
17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/modules/ECMAddQch.cmake 2017-08-02
20:41:22.000000000 +0200
@@ -289,7 +289,7 @@
# get Qt version, if any
find_package(Qt5Core CONFIG QUIET)
# lookup tag files
- query_qmake(qt_docs_dir QT_INSTALL_DOCS)
+ query_qmake(qt_docs_dir QT_INSTALL_DOCS TRY)
find_path(_qtcoreTagsPath qtcore/qtcore.tags
PATHS
${qt_docs_dir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.36.0/modules/ECMGeneratePriFile.cmake
new/extra-cmake-modules-5.37.0/modules/ECMGeneratePriFile.cmake
--- old/extra-cmake-modules-5.36.0/modules/ECMGeneratePriFile.cmake
2017-06-23 17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/modules/ECMGeneratePriFile.cmake
2017-08-02 20:41:22.000000000 +0200
@@ -102,7 +102,7 @@
set(_askqmake OFF)
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
include(ECMQueryQmake)
- query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX)
+ query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
set(_askqmake ON)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.36.0/modules/ECMQueryQmake.cmake
new/extra-cmake-modules-5.37.0/modules/ECMQueryQmake.cmake
--- old/extra-cmake-modules-5.36.0/modules/ECMQueryQmake.cmake 2017-06-23
17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/modules/ECMQueryQmake.cmake 2017-08-02
20:41:22.000000000 +0200
@@ -9,12 +9,26 @@
set(QMAKE_EXECUTABLE ${_qmake_executable_default}
CACHE FILEPATH "Location of the Qt5 qmake executable")
+# Helper method
# This is not public API (yet)!
+# Usage: query_qmake(<result_variable> <qt_variable> [TRY])
+# Passing TRY will result in the method not failing fatal if no qmake
executable
+# has been found, but instead simply returning an empty string
function(query_qmake result_variable qt_variable)
+ set(options TRY)
+ set(oneValueArgs )
+ set(multiValueArgs )
+
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
+
if(NOT QMAKE_EXECUTABLE)
- set(${result_variable} "" PARENT_SCOPE)
- message(WARNING "Should specify a qmake Qt5 binary. Can't check
${qt_variable}")
- return()
+ if(ARGS_TRY)
+ set(${result_variable} "" PARENT_SCOPE)
+ message(STATUS "No qmake Qt5 binary found. Can't check
${qt_variable}")
+ return()
+ else()
+ message(FATAL_ERROR "No qmake Qt5 binary found. Can't check
${qt_variable} as required")
+ endif()
endif()
execute_process(
COMMAND ${QMAKE_EXECUTABLE} -query "${qt_variable}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.36.0/tests/ECMPoQmToolsTest/check.cmake.in
new/extra-cmake-modules-5.37.0/tests/ECMPoQmToolsTest/check.cmake.in
--- old/extra-cmake-modules-5.36.0/tests/ECMPoQmToolsTest/check.cmake.in
2017-06-23 17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/tests/ECMPoQmToolsTest/check.cmake.in
2017-08-02 20:41:22.000000000 +0200
@@ -76,7 +76,7 @@
string(STRIP "${output}" stripped_output)
if(NOT stripped_output STREQUAL exp_output_${catalog_name}_${lang})
message(WARNING "${name}[${lang}] output was
\"${stripped_output}\", but expected \"${exp_output_${catalog_name}_${lang}}\"")
- set(fail ON)
+ set(fail ON PARENT_SCOPE)
else()
message(STATUS "${name}[${lang}] output was
\"${stripped_output}\", as expected")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.36.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
new/extra-cmake-modules-5.37.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
---
old/extra-cmake-modules-5.36.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
2017-06-23 17:48:53.000000000 +0200
+++
new/extra-cmake-modules-5.37.0/tests/ECMQtDeclareLoggingCategoryTest/testmain.cpp
2017-08-02 20:41:22.000000000 +0200
@@ -31,7 +31,12 @@
#include <iostream>
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
+ // Make the unit test more reliable on system which have these env vars set
+ qunsetenv("QT_LOGGING_CONF");
+ qunsetenv("QT_LOGGING_RULES");
+
QCoreApplication qapp(argc, argv);
bool success = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.36.0/toolchain/Android.cmake
new/extra-cmake-modules-5.37.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.36.0/toolchain/Android.cmake 2017-06-23
17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/toolchain/Android.cmake 2017-08-02
20:41:22.000000000 +0200
@@ -28,7 +28,7 @@
# the variable names are:
#
# ``ANDROID_NDK``
-# The NSK root path.
+# The NDK root path.
# ``ANDROID_SDK_ROOT``
# The SDK root path.
#
@@ -216,7 +216,7 @@
# needed for Qt to define Q_OS_ANDROID
add_definitions(-DANDROID)
-set(ECM_DIR "${CMAKE_CURRENT_LIST_DIR}/.." CACHE STRING "")
+set(ECM_DIR "${CMAKE_CURRENT_LIST_DIR}/../cmake" CACHE STRING "")
######### generation
@@ -243,11 +243,11 @@
COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}"
COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
COMMAND cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json"
"-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>"
"-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}"
"-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
- COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
+ COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled "\\$(ARGS)"
)
add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET}
- COMMAND adb install -r "${EXPORT_DIR}/bin/QtApp-debug.apk"
+ COMMAND adb install -r
"${EXPORT_DIR}/build/outputs/apk/${QTANDROID_EXPORTED_TARGET}_build_apk-debug.apk"
)
else()
message(STATUS "You can export a target by specifying
-DQTANDROID_EXPORTED_TARGET=<targetname>")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.36.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.37.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.36.0/toolchain/deployment-file.json.in
2017-06-23 17:48:53.000000000 +0200
+++ new/extra-cmake-modules-5.37.0/toolchain/deployment-file.json.in
2017-08-02 20:41:22.000000000 +0200
@@ -8,7 +8,7 @@
"ndk-host": "@_HOST@",
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
- "qml-root-path": "@CMAKE_INSTALL_PREFIX@",
+ "qml-root-path": "@CMAKE_SOURCE_DIRECTORY@",
##EXTRALIBS##
##EXTRAPLUGINS##
"android-package-source-directory": "@ANDROID_APK_DIR@",
