Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-12-19 13:38:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Wed Dec 19 13:38:38 2018 rev:60 rq:658537 version:5.53.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-11-14 14:31:54.779412386 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.28833/extra-cmake-modules.changes
2018-12-19 13:39:52.756086977 +0100
@@ -1,0 +2,14 @@
+Sun Dec 09 19:43:42 UTC 2018 - [email protected]
+
+- Update to 5.53.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.53.0.php
+- Changes since 5.52.0:
+ * Rename FindExiv2 to FindLibExiv2.
+ * Add FindExiv2.cmake to ECM
+ * Android: improve clang support
+ * FindQHelpGenerator: try to find Qt5Help instead of Qt5Core
+ * Use `MATCHES "Clang"` to detect clang
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.52.0.tar.xz
New:
----
extra-cmake-modules-5.53.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.Jck76e/_old 2018-12-19 13:39:53.200086349 +0100
+++ /var/tmp/diff_new_pack.Jck76e/_new 2018-12-19 13:39:53.200086349 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.52
+%define _tar_path 5.53
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -27,7 +27,7 @@
%bcond_with doc
%endif
Name: extra-cmake-modules
-Version: 5.52.0
+Version: 5.53.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.52.0.tar.xz -> extra-cmake-modules-5.53.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.52.0/CMakeLists.txt
new/extra-cmake-modules-5.53.0/CMakeLists.txt
--- old/extra-cmake-modules-5.52.0/CMakeLists.txt 2018-10-29
00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/CMakeLists.txt 2018-11-20
14:36:01.000000000 +0100
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.52.0") # handled by release scripts
+set(VERSION "5.53.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.52.0/attic/modules/FindExiv2.cmake
new/extra-cmake-modules-5.53.0/attic/modules/FindExiv2.cmake
--- old/extra-cmake-modules-5.52.0/attic/modules/FindExiv2.cmake
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/attic/modules/FindExiv2.cmake
1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-# - Try to find the Exiv2 library
-#
-# EXIV2_MIN_VERSION - You can set this variable to the minimum version you
need
-# before doing FIND_PACKAGE(Exiv2). The default is 0.12.
-#
-# Once done this will define
-#
-# EXIV2_FOUND - system has libexiv2
-# EXIV2_INCLUDE_DIR - the libexiv2 include directory
-# EXIV2_LIBRARIES - Link these to use libexiv2
-# EXIV2_DEFINITIONS - Compiler switches required for using libexiv2
-#
-# The minimum required version of Exiv2 can be specified using the
-# standard syntax, e.g. find_package(Exiv2 0.17)
-#
-# For compatibility, also the variable EXIV2_MIN_VERSION can be set to the
minimum version
-# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
-
-# Copyright (c) 2010, Alexander Neundorf, <[email protected]>
-# Copyright (c) 2008, Gilles Caulier, <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# Support EXIV2_MIN_VERSION for compatibility:
-if(NOT Exiv2_FIND_VERSION)
- set(Exiv2_FIND_VERSION "${EXIV2_MIN_VERSION}")
-endif()
-
-# the minimum version of exiv2 we require
-if(NOT Exiv2_FIND_VERSION)
- set(Exiv2_FIND_VERSION "0.12")
-endif()
-
-
-if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_EXIV2 QUIET exiv2)
- set(EXIV2_DEFINITIONS ${PC_EXIV2_CFLAGS_OTHER})
-endif (NOT WIN32)
-
-
-find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp
- HINTS
- ${PC_EXIV2_INCLUDEDIR}
- ${PC_EXIV2_INCLUDE_DIRS}
- )
-
-find_library(EXIV2_LIBRARY NAMES exiv2 libexiv2
- HINTS
- ${PC_EXIV2_LIBDIR}
- ${PC_EXIV2_LIBRARY_DIRS}
- )
-
-
-# Get the version number from exiv2/version.hpp and store it in the cache:
-if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
- file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
- string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy
"${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define EXIV2_MINOR_VERSION +\\( *([0-9]+) *\\)" _dummy
"${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_MINOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define EXIV2_PATCH_VERSION +\\( *([0-9]+) *\\)" _dummy
"${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}")
-
- set(EXIV2_VERSION
"${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE
STRING "Version number of Exiv2" FORCE)
-endif()
-
-set(EXIV2_LIBRARIES "${EXIV2_LIBRARY}")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Exiv2 REQUIRED_VARS EXIV2_LIBRARY
EXIV2_INCLUDE_DIR
- VERSION_VAR EXIV2_VERSION)
-
-mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARY)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/docs/find-module/FindLibExiv2.rst
new/extra-cmake-modules-5.53.0/docs/find-module/FindLibExiv2.rst
--- old/extra-cmake-modules-5.52.0/docs/find-module/FindLibExiv2.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/docs/find-module/FindLibExiv2.rst
2018-11-20 14:36:01.000000000 +0100
@@ -0,0 +1 @@
+.. ecm-module:: ../../find-modules/FindLibExiv2.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/find-modules/FindLibExiv2.cmake
new/extra-cmake-modules-5.53.0/find-modules/FindLibExiv2.cmake
--- old/extra-cmake-modules-5.52.0/find-modules/FindLibExiv2.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/find-modules/FindLibExiv2.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -0,0 +1,115 @@
+#.rst:
+# FindLibExiv2
+# ------------
+#
+# Try to find the Exiv2 library.
+#
+# This will define the following variables:
+#
+# ``LibExiv2_FOUND``
+# System has LibExiv2.
+#
+# ``LibExiv2_VERSION``
+# The version of LibExiv2.
+#
+# ``LibExiv2_INCLUDE_DIRS``
+# This should be passed to target_include_directories() if
+# the target is not used for linking.
+#
+# ``LibExiv2_LIBRARIES``
+# The LibExiv2 library.
+# This can be passed to target_link_libraries() instead of
+# the ``LibExiv2::LibExiv2`` target
+#
+# If ``LibExiv2_FOUND`` is TRUE, the following imported target
+# will be available:
+#
+# ``LibExiv2::LibExiv2``
+# The Exiv2 library
+#
+# Since 5.53.0.
+#
+#=============================================================================
+# Copyright (c) 2018, Christophe Giboudeaux, <[email protected]>
+# Copyright (c) 2010, Alexander Neundorf, <[email protected]>
+# Copyright (c) 2008, Gilles Caulier, <[email protected]>
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_EXIV2 QUIET exiv2)
+
+find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
+ HINTS ${PC_EXIV2_INCLUDEDIR}
+)
+
+find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
+ HINTS ${PC_EXIV2_LIBRARY_DIRS}
+)
+
+set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
+
+if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
+ # With exiv >= 0.27, the version #defines are in exv_conf.h instead of
version.hpp
+ foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
+ if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
+ file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}"
_exiv_version_file_content)
+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)"
EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
+ string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)"
EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
+ string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)"
EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
+ if(EXIV2_MAJOR_VERSION_MATCH)
+ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1"
EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1"
EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"
EXIV2_PATCH_VERSION ${EXIV2_PATCH_VERSION_MATCH})
+ endif()
+ endif()
+ endforeach()
+
+ set(LibExiv2_VERSION
"${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibExiv2
+ FOUND_VAR LibExiv2_FOUND
+ REQUIRED_VARS LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
+ VERSION_VAR LibExiv2_VERSION
+)
+
+mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
+
+if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
+ add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
+ set_target_properties(LibExiv2::LibExiv2 PROPERTIES
+ IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
+ INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
+ )
+endif()
+
+include(FeatureSummary)
+set_package_properties(LibExiv2 PROPERTIES
+ URL "http://www.exiv2.org";
+ DESCRIPTION "Image metadata support"
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/find-modules/FindQHelpGenerator.cmake
new/extra-cmake-modules-5.53.0/find-modules/FindQHelpGenerator.cmake
--- old/extra-cmake-modules-5.52.0/find-modules/FindQHelpGenerator.cmake
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/find-modules/FindQHelpGenerator.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -33,7 +33,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-find_package(Qt5Core QUIET)
+find_package(Qt5Help QUIET)
if (TARGET Qt5::qhelpgenerator)
get_target_property(QHelpGenerator_EXECUTABLE Qt5::qhelpgenerator LOCATION)
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/kde-modules/KDECMakeSettings.cmake
new/extra-cmake-modules-5.53.0/kde-modules/KDECMakeSettings.cmake
--- old/extra-cmake-modules-5.52.0/kde-modules/KDECMakeSettings.cmake
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/kde-modules/KDECMakeSettings.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -289,7 +289,7 @@
endif()
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
option(ENABLE_CLAZY "Enable Clazy warnings" OFF)
if(ENABLE_CLAZY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/kde-modules/KDECompilerSettings.cmake
new/extra-cmake-modules-5.53.0/kde-modules/KDECompilerSettings.cmake
--- old/extra-cmake-modules-5.52.0/kde-modules/KDECompilerSettings.cmake
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/kde-modules/KDECompilerSettings.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -341,7 +341,7 @@
############################################################
if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
- (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR
+ (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE) OR
(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
# Linker warnings should be treated as errors
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings
${CMAKE_SHARED_LINKER_FLAGS}")
@@ -488,7 +488,7 @@
if (CMAKE_GENERATOR STREQUAL "Ninja" AND
((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION
VERSION_LESS 4.9) OR
- (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)))
+ (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION
VERSION_LESS 3.5)))
# Force colored warnings in Ninja's output, if the compiler has
-fdiagnostics-color support.
# Rationale in https://github.com/ninja-build/ninja/issues/814
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/kde-modules/KDEFrameworkCompilerSettings.cmake
new/extra-cmake-modules-5.53.0/kde-modules/KDEFrameworkCompilerSettings.cmake
---
old/extra-cmake-modules-5.52.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2018-10-29 00:08:27.000000000 +0100
+++
new/extra-cmake-modules-5.53.0/kde-modules/KDEFrameworkCompilerSettings.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -71,7 +71,7 @@
endif()
endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wzero-as-null-pointer-constant"
)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/modules/ECMEnableSanitizers.cmake
new/extra-cmake-modules-5.53.0/modules/ECMEnableSanitizers.cmake
--- old/extra-cmake-modules-5.52.0/modules/ECMEnableSanitizers.cmake
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/modules/ECMEnableSanitizers.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -165,7 +165,7 @@
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
link_libraries(${XSAN_LINKER_FLAGS})
endif()
- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
string(REPLACE "-Wl,--no-undefined" ""
CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
string(REPLACE "-Wl,--no-undefined" ""
CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
endif ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.52.0/toolchain/Android.cmake
new/extra-cmake-modules-5.53.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.52.0/toolchain/Android.cmake 2018-10-29
00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/toolchain/Android.cmake 2018-11-20
14:36:01.000000000 +0100
@@ -42,12 +42,6 @@
#
# Additional options are specified as cache variables (eg: on the command
line):
#
-# ``ANDROID_TOOLCHAIN``
-# The toolchain to use. See the ``toolchains`` directory of the NDK.
-# Default: ``arm-linux-androideabi``.
-# ``ANDROID_COMPILER_PREFIX``
-# The prefix for the gcc and g++ executables. See the
``toolchains/$ANDROID_TOOLCHAIN/prebuilt/*/bin/*-gcc`` in the NDK.
-# Default: ``arm-linux-androideabi``.
# ``ANDROID_ABI``
# The ABI to use. See the ``sources/cxx-stl/gnu-libstdc++/*/libs``
# directories in the NDK. Default: ``armeabi-v7a``.
@@ -156,8 +150,6 @@
set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "14")
set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path")
-set(ANDROID_TOOLCHAIN "arm-linux-androideabi" CACHE string "Used SDK")
-set(ANDROID_COMPILER_PREFIX "arm-linux-androideabi" CACHE string "Prefix for
gcc/g++/etc")
file(GLOB build-tools LIST_DIRECTORIES TRUE RELATIVE
${ANDROID_SDK_ROOT}/build-tools ${ANDROID_SDK_ROOT}/build-tools/*)
list(GET build-tools 0 _default_sdk)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.53.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.52.0/toolchain/ECMAndroidDeployQt.cmake
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/toolchain/ECMAndroidDeployQt.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -44,7 +44,13 @@
file(WRITE ${CMAKE_BINARY_DIR}/stl "${OUTSTR}")
endif()
endfunction()
+ function(haveranlib var access VALUE)
+ if (NOT VALUE STREQUAL "")
+ file(WRITE ${CMAKE_BINARY_DIR}/ranlib "${VALUE}")
+ endif()
+ endfunction()
variable_watch(CMAKE_CXX_STANDARD_LIBRARIES havestl)
+ variable_watch(CMAKE_RANLIB haveranlib)
if (NOT TARGET create-apk)
add_custom_target(create-apk)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.53.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.52.0/toolchain/deployment-file.json.in
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/toolchain/deployment-file.json.in
2018-11-20 14:36:01.000000000 +0100
@@ -2,9 +2,9 @@
"qt": "@_qt5Core_install_prefix@",
"sdk": "@ANDROID_SDK_ROOT@",
"ndk": "@CMAKE_ANDROID_NDK@",
- "toolchain-prefix": "@ANDROID_TOOLCHAIN@",
- "tool-prefix": "@ANDROID_COMPILER_PREFIX@",
- "toolchain-version": "@CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION@",
+ "toolchain-prefix": "##ANDROID_TOOL_PREFIX##",
+ "tool-prefix": "##ANDROID_COMPILER_PREFIX##",
+ "toolchain-version": "##ANDROID_TOOLCHAIN_VERSION##",
"ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@",
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@EXECUTABLE_DESTINATION_PATH@",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.52.0/toolchain/specifydependencies.cmake
new/extra-cmake-modules-5.53.0/toolchain/specifydependencies.cmake
--- old/extra-cmake-modules-5.52.0/toolchain/specifydependencies.cmake
2018-10-29 00:08:27.000000000 +0100
+++ new/extra-cmake-modules-5.53.0/toolchain/specifydependencies.cmake
2018-11-20 14:36:01.000000000 +0100
@@ -51,7 +51,13 @@
file(READ "${INPUT_FILE}" CONTENTS)
file(READ "stl" stl_contents)
-string(REPLACE "##EXTRALIBS##" "${extralibs}" NEWCONTENTS "${CONTENTS}")
+file(READ "ranlib" ranlib_contents)
+string(REGEX MATCH ".+/toolchains/(.+)-([^\\-]+)/prebuilt/.*/bin/(.*)-ranlib"
x ${ranlib_contents})
+
+string(REPLACE "##ANDROID_TOOL_PREFIX##" "${CMAKE_MATCH_1}" NEWCONTENTS
"${CONTENTS}")
+string(REPLACE "##ANDROID_TOOLCHAIN_VERSION##" "${CMAKE_MATCH_2}" NEWCONTENTS
"${NEWCONTENTS}")
+string(REPLACE "##ANDROID_COMPILER_PREFIX##" "${CMAKE_MATCH_3}" NEWCONTENTS
"${NEWCONTENTS}")
+string(REPLACE "##EXTRALIBS##" "${extralibs}" NEWCONTENTS "${NEWCONTENTS}")
string(REPLACE "##EXTRAPLUGINS##" "${extraplugins}" NEWCONTENTS
"${NEWCONTENTS}")
string(REPLACE "##CMAKE_CXX_STANDARD_LIBRARIES##" "${stl_contents}"
NEWCONTENTS "${NEWCONTENTS}")
file(WRITE "${OUTPUT_FILE}" ${NEWCONTENTS})
