Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2018-05-18 14:18:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Fri May 18 14:18:28 2018 rev:53 rq:607531 version:5.46.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2018-04-19 15:15:30.576884506 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes
2018-05-18 14:19:55.583935268 +0200
@@ -1,0 +2,16 @@
+Sun May 13 21:02:59 UTC 2018 - [email protected]
+
+- Update to 5.46.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.46.0.php
+- Changes since 5.45.0:
+ * Include FeatureSummary before calling set_package_properties.
+ * Android: fix dumb mistakes
+ * Don't install plugins within lib on android
+ * Android: Make sure variable is defined before using it
+ * Make it possible to build several apk out of a project
+ * Check if the application androiddeployqt package has a main() symbol
+ * Android: Explicitly point at upstream documentation and deprecate
duplicated concepts
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.45.0.tar.xz
New:
----
extra-cmake-modules-5.46.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.12DIFd/_old 2018-05-18 14:19:58.203839123 +0200
+++ /var/tmp/diff_new_pack.12DIFd/_new 2018-05-18 14:19:58.203839123 +0200
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.45
+%define _tar_path 5.46
# 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.45.0
+Version: 5.46.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.45.0.tar.xz -> extra-cmake-modules-5.46.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.45.0/CMakeLists.txt
new/extra-cmake-modules-5.46.0/CMakeLists.txt
--- old/extra-cmake-modules-5.45.0/CMakeLists.txt 2018-04-04
18:46:25.000000000 +0200
+++ new/extra-cmake-modules-5.46.0/CMakeLists.txt 2018-05-04
19:34:33.000000000 +0200
@@ -32,7 +32,7 @@
# Preliminary setup
#
-set(VERSION "5.45.0") # handled by release scripts
+set(VERSION "5.46.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.45.0/find-modules/FindGLIB2.cmake
new/extra-cmake-modules-5.46.0/find-modules/FindGLIB2.cmake
--- old/extra-cmake-modules-5.45.0/find-modules/FindGLIB2.cmake 2018-04-04
18:46:25.000000000 +0200
+++ new/extra-cmake-modules-5.46.0/find-modules/FindGLIB2.cmake 2018-05-04
19:34:33.000000000 +0200
@@ -93,6 +93,8 @@
mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_INCLUDE_DIR
GLIB2_LIBRARIES GLIB2_LIBRARY)
+
+include(FeatureSummary)
set_package_properties(GLIB2 PROPERTIES
URL "https://wiki.gnome.org/Projects/GLib";
DESCRIPTION "Event loop and utility library")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.45.0/find-modules/FindPulseAudio.cmake
new/extra-cmake-modules-5.46.0/find-modules/FindPulseAudio.cmake
--- old/extra-cmake-modules-5.45.0/find-modules/FindPulseAudio.cmake
2018-04-04 18:46:25.000000000 +0200
+++ new/extra-cmake-modules-5.46.0/find-modules/FindPulseAudio.cmake
2018-05-04 19:34:33.000000000 +0200
@@ -123,6 +123,8 @@
mark_as_advanced(PulseAudio_INCLUDE_DIRS PULSEAUDIO_INCLUDE_DIR
PulseAudio_LIBRARIES PULSEAUDIO_LIBRARY
PulseAudio_MAINLOOP_LIBRARY PULSEAUDIO_MAINLOOP_LIBRARY)
+
+include(FeatureSummary)
set_package_properties(PulseAudio PROPERTIES
URL "https://www.freedesktop.org/wiki/Software/PulseAudio";
DESCRIPTION "Sound server, for sound stream routing and mixing")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.45.0/kde-modules/KDEInstallDirs.cmake
new/extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake
--- old/extra-cmake-modules-5.45.0/kde-modules/KDEInstallDirs.cmake
2018-04-04 18:46:25.000000000 +0200
+++ new/extra-cmake-modules-5.46.0/kde-modules/KDEInstallDirs.cmake
2018-05-04 19:34:33.000000000 +0200
@@ -488,7 +488,12 @@
"QtQuick2 imports"
QML_INSTALL_DIR)
else()
- _define_relative(QTPLUGINDIR LIBDIR "plugins"
+ set(_pluginsDirParent LIBDIR)
+ if (ANDROID)
+ set(_pluginsDirParent)
+ #androiddeployqt wants plugins right in the prefix
+ endif()
+ _define_relative(QTPLUGINDIR "${_pluginsDirParent}" "plugins"
"Qt plugins"
QT_PLUGIN_INSTALL_DIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.45.0/toolchain/Android.cmake
new/extra-cmake-modules-5.46.0/toolchain/Android.cmake
--- old/extra-cmake-modules-5.45.0/toolchain/Android.cmake 2018-04-04
18:46:25.000000000 +0200
+++ new/extra-cmake-modules-5.46.0/toolchain/Android.cmake 2018-05-04
19:34:33.000000000 +0200
@@ -9,9 +9,17 @@
# Furthermore, if desired, an APK can be directly generated by using the
# `androiddeployqt <http://doc.qt.io/qt-5/deployment-android.html>`_ tool.
#
+# CMake upstream has Android support now. This module will still give us some
+# useful features offering androiddeployqt integration and adequate executables
+# format for our Android applications.
+#
+# Since we are using CMake Android support, any information from CMake
documentation
+# still applies:
+#
https://cmake.org/cmake/help/v3.7/manual/cmake-toolchains.7.html#cross-compiling-for-android
+#
# .. note::
#
-# This module requires CMake 3.1.
+# This module requires CMake 3.7.
#
# Since 1.7.0.
#
@@ -27,15 +35,13 @@
# can be done on the commandline or with environment variables; in either case
# the variable names are:
#
-# ``ANDROID_NDK``
+# ``CMAKE_ANDROID_NDK``
# The NDK root path.
# ``ANDROID_SDK_ROOT``
# The SDK root path.
#
# Additional options are specified as cache variables (eg: on the command
line):
#
-# ``ANDROID_ARCHITECTURE``
-# The architecture to compile for. Default: ``arm``.
# ``ANDROID_TOOLCHAIN``
# The toolchain to use. See the ``toolchains`` directory of the NDK.
# Default: ``arm-linux-androideabi``.
@@ -45,12 +51,6 @@
# ``ANDROID_ABI``
# The ABI to use. See the ``sources/cxx-stl/gnu-libstdc++/*/libs``
# directories in the NDK. Default: ``armeabi-v7a``.
-# ``ANDROID_GCC_VERSION``
-# The GCC version to use. Default: ``4.9``.
-# ``ANDROID_API_LEVEL``
-# The `API level
-#
<http://developer.android.com/guide/topics/manifest/uses-sdk-element.html>`_
-# to require. Default: ``14``.
# ``ANDROID_SDK_BUILD_TOOLS_REVISION``
# The build tools version to use. Default: ``21.1.1``.
#
@@ -78,11 +78,12 @@
# After building the application, you will need to generate an APK that can be
# deployed to an Android device. This module integrates androiddeployqt support
# to help with this for Qt-based projects. To enable this, set the
-# ``QTANDROID_EXPORTED_TARGET`` variable to the target you wish to export as an
-# APK, as well as ``ANDROID_APK_DIR`` to a directory containing some basic
-# information. This will create a ``create-apk-<target>`` target that will
-# generate the APK file. See the `Qt on Android deployment documentation
-# <http://doc.qt.io/qt-5/deployment-android.html>`_ for more information.
+# ``QTANDROID_EXPORTED_TARGET`` variable to the targets you wish to export as
an
+# APK (in a ;-separed list), as well as ``ANDROID_APK_DIR`` to a directory
+# containing some basic information. This will create a ``create-apk-<target>``
+# target that will generate the APK file. See the `Qt on Android deployment
+# documentation <http://doc.qt.io/qt-5/deployment-android.html>`_ for more
+# information.
#
# For example, you could do::
#
@@ -135,22 +136,25 @@
cmake_minimum_required(VERSION "3.7")
-#input
-set(ANDROID_NDK "$ENV{ANDROID_NDK}" CACHE path "Android NDK path")
+macro(set_deprecated_variable actual_variable deprecated_variable
default_value)
+ set(${deprecated_variable} "${default_value}" CACHE STRING "Deprecated.
Use ${actual_variable}")
+ if (NOT DEFINED ${${actual_variable}})
+ set(${actual_variable} ${${deprecated_variable}})
+ endif()
+endmacro()
+
+set_deprecated_variable(CMAKE_ANDROID_NDK ANDROID_NDK "$ENV{ANDROID_NDK}")
+set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE "arm")
+set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
ANDROID_GCC_VERSION "4.9")
+set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a")
+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_ARCHITECTURE "arm" CACHE string "Used Architecture, related to the
ABI and TOOLCHAIN")
set(ANDROID_TOOLCHAIN "arm-linux-androideabi" CACHE string "Used SDK")
set(ANDROID_COMPILER_PREFIX "arm-linux-androideabi" CACHE string "Prefix for
gcc/g++/etc")
-set(ANDROID_ABI "armeabi-v7a" CACHE string "Used ABI")
-set(ANDROID_GCC_VERSION "4.9" CACHE string "Used GCC version" )
-set(ANDROID_API_LEVEL "14" CACHE string "Android API Level")
set(ANDROID_SDK_BUILD_TOOLS_REVISION "21.1.1" CACHE string "Android API Level")
-
-set(CMAKE_ANDROID_NDK ${ANDROID_NDK})
-set(CMAKE_SYSTEM_VERSION ${ANDROID_API_LEVEL})
-set(CMAKE_ANDROID_ARCH ${ANDROID_ARCHITECTURE})
-set(CMAKE_ANDROID_ARCH_ABI ${ANDROID_ABI})
+set(CMAKE_SYSTEM_VERSION ${CMAKE_ANDROID_API})
set(CMAKE_SYSTEM_NAME Android)
if (NOT CMAKE_ANDROID_STL_TYPE)
set(CMAKE_ANDROID_STL_TYPE gnustl_shared)
@@ -162,7 +166,8 @@
if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH)
SET(ECM_ADDITIONAL_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH})
endif()
-SET(CMAKE_FIND_ROOT_PATH ${ANDROID_NDK} ${ANDROID_NDK}/sysroot
${CMAKE_SYSROOT} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
+
+SET(CMAKE_FIND_ROOT_PATH ${CMAKE_ANDROID_NDK} ${CMAKE_ANDROID_NDK}/sysroot
${CMAKE_SYSROOT} ${ECM_ADDITIONAL_FIND_ROOT_PATH})
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -177,68 +182,23 @@
######### generation
-set(CREATEAPK_TARGET_NAME "create-apk-${QTANDROID_EXPORTED_TARGET}")
# Need to ensure we only get in here once, as this file is included twice:
# from CMakeDetermineSystem.cmake and from CMakeSystem.cmake generated within
the
# build directory.
-if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME})
+if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET "create-apk")
get_filename_component(_CMAKE_ANDROID_DIR "${CMAKE_TOOLCHAIN_FILE}" PATH)
- if(NOT DEFINED ANDROID_APK_DIR)
- message(FATAL_ERROR "Define an apk dir to initialize from using
-DANDROID_APK_DIR=<path>. The specified directory must contain the
AndroidManifest.xml file.")
- elseif(NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml")
- message(FATAL_ERROR "Cannot find
${ANDROID_APK_DIR}/AndroidManifest.xml according to ANDROID_APK_DIR")
- endif()
-
- find_package(Qt5Core REQUIRED)
+ list(LENGTH QTANDROID_EXPORTED_TARGET targetsCount)
+ include(${_CMAKE_ANDROID_DIR}/ECMAndroidDeployQt.cmake)
- set(EXPORT_DIR
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/")
- set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${ANDROID_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
- set(QML_IMPORT_PATHS "")
- foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
- # qmlimportscanner chokes on symlinks, so we need to resolve those
first
- get_filename_component(qml_path "${prefix}/lib/qml" REALPATH)
- if(EXISTS ${qml_path})
- if (QML_IMPORT_PATHS)
- set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${qml_path}")
- else()
- set(QML_IMPORT_PATHS "${qml_path}")
- endif()
+ math(EXPR last "${targetsCount}-1")
+ foreach(idx RANGE 0 ${last})
+ list(GET QTANDROID_EXPORTED_TARGET ${idx} exportedTarget)
+ list(GET ANDROID_APK_DIR ${idx} APK_DIR)
+ if(APK_DIR AND NOT EXISTS "${APK_DIR}/AndroidManifest.xml")
+ message(FATAL_ERROR "Cannot find ${APK_DIR}/AndroidManifest.xml
according to ANDROID_APK_DIR. ${ANDROID_APK_DIR} ${exportedTarget}")
endif()
+ ecm_androiddeployqt("${exportedTarget}"
"${ECM_ADDITIONAL_FIND_ROOT_PATH}" "${APK_DIR}")
endforeach()
- set(EXTRA_PREFIX_DIRS "")
- foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
- if (EXTRA_PREFIX_DIRS)
- set(EXTRA_PREFIX_DIRS "${EXTRA_PREFIX_DIRS}, \"${prefix}\"")
- else()
- set(EXTRA_PREFIX_DIRS "\"${prefix}\"")
- endif()
- endforeach()
- string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" _LOWER_CMAKE_HOST_SYSTEM_NAME)
- configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${QTANDROID_EXPORTED_TARGET}-deployment.json.in")
-
- if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
- set(arguments "\\$(ARGS)")
- endif()
-
- function(havestl var access VALUE)
- if (NOT VALUE STREQUAL "")
- file(WRITE ${CMAKE_BINARY_DIR}/stl "${VALUE}")
- endif()
- endfunction()
- variable_watch(CMAKE_CXX_STANDARD_LIBRARIES havestl)
-
- 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 "${ANDROID_APK_DIR}" "${EXPORT_DIR}"
- COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>"
"${EXECUTABLE_DESTINATION_PATH}"
- COMMAND LANG=C cmake
-DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in"
-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}\"" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
- COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled ${arguments}
- )
-
- add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET}
- 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>")
+ message(STATUS "You can export a target by specifying
-DQTANDROID_EXPORTED_TARGET=<targetname> and -DANDROID_APK_DIR=<paths>")
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.45.0/toolchain/ECMAndroidDeployQt.cmake
new/extra-cmake-modules-5.46.0/toolchain/ECMAndroidDeployQt.cmake
--- old/extra-cmake-modules-5.45.0/toolchain/ECMAndroidDeployQt.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.46.0/toolchain/ECMAndroidDeployQt.cmake
2018-05-04 19:34:33.000000000 +0200
@@ -0,0 +1,65 @@
+find_package(Qt5Core REQUIRED)
+
+function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET
ECM_ADDITIONAL_FIND_ROOT_PATH ANDROID_APK_DIR)
+ get_filename_component(_qt5Core_install_prefix "${Qt5Core_DIR}/../../../"
ABSOLUTE)
+ if(NOT ANDROID_APK_DIR)
+ set(ANDROID_APK_DIR
"${_qt5Core_install_prefix}/src/android/templates/")
+ endif()
+
+ set(EXPORT_DIR
"${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/")
+ set(EXECUTABLE_DESTINATION_PATH
"${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
+ set(QML_IMPORT_PATHS "")
+ foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
+ # qmlimportscanner chokes on symlinks, so we need to resolve those
first
+ get_filename_component(qml_path "${prefix}/lib/qml" REALPATH)
+ if(EXISTS ${qml_path})
+ if (QML_IMPORT_PATHS)
+ set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${qml_path}")
+ else()
+ set(QML_IMPORT_PATHS "${qml_path}")
+ endif()
+ endif()
+ endforeach()
+
+ set(EXTRA_PREFIX_DIRS "")
+ foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
+ if (EXTRA_PREFIX_DIRS)
+ set(EXTRA_PREFIX_DIRS "${EXTRA_PREFIX_DIRS}, \"${prefix}\"")
+ else()
+ set(EXTRA_PREFIX_DIRS "\"${prefix}\"")
+ endif()
+ endforeach()
+ string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" _LOWER_CMAKE_HOST_SYSTEM_NAME)
+ configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in"
"${QTANDROID_EXPORTED_TARGET}-deployment.json.in")
+
+ if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+ set(arguments "\\$(ARGS)")
+ endif()
+
+ function(havestl var access VALUE)
+ if (NOT VALUE STREQUAL "")
+ file(WRITE ${CMAKE_BINARY_DIR}/stl "${VALUE}")
+ endif()
+ endfunction()
+ variable_watch(CMAKE_CXX_STANDARD_LIBRARIES havestl)
+
+ if (NOT TARGET create-apk)
+ add_custom_target(create-apk)
+ endif()
+
+ 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 "${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.in"
-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}\"" -P
${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
+ COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input
"${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}"
--deployment bundled ${arguments}
+ )
+
+ add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET}
+ COMMAND adb install -r
"${EXPORT_DIR}/build/outputs/apk/${QTANDROID_EXPORTED_TARGET}_build_apk-debug.apk"
+ )
+ add_dependencies(create-apk ${CREATEAPK_TARGET_NAME})
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.45.0/toolchain/deployment-file.json.in
new/extra-cmake-modules-5.46.0/toolchain/deployment-file.json.in
--- old/extra-cmake-modules-5.45.0/toolchain/deployment-file.json.in
2018-04-04 18:46:25.000000000 +0200
+++ new/extra-cmake-modules-5.46.0/toolchain/deployment-file.json.in
2018-05-04 19:34:33.000000000 +0200
@@ -1,10 +1,10 @@
{
"qt": "@_qt5Core_install_prefix@",
"sdk": "@ANDROID_SDK_ROOT@",
- "ndk": "@ANDROID_NDK@",
+ "ndk": "@CMAKE_ANDROID_NDK@",
"toolchain-prefix": "@ANDROID_TOOLCHAIN@",
"tool-prefix": "@ANDROID_COMPILER_PREFIX@",
- "toolchain-version": "@ANDROID_GCC_VERSION@",
+ "toolchain-version": "@CMAKE_ANDROID_NDK_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.45.0/toolchain/hasMainSymbol.cmake
new/extra-cmake-modules-5.46.0/toolchain/hasMainSymbol.cmake
--- old/extra-cmake-modules-5.45.0/toolchain/hasMainSymbol.cmake
1970-01-01 01:00:00.000000000 +0100
+++ new/extra-cmake-modules-5.46.0/toolchain/hasMainSymbol.cmake
2018-05-04 19:34:33.000000000 +0200
@@ -0,0 +1,10 @@
+execute_process(COMMAND nm --dynamic ${TARGET} ERROR_VARIABLE nm_errors
OUTPUT_VARIABLE out RESULT_VARIABLE result)
+
+if (NOT result EQUAL 0)
+ message(FATAL_ERROR "nm failed on ${TARGET} exit(${result}): ${nm_errors}")
+endif()
+
+string(FIND ${out} " T main\n" found)
+if(found LESS 0)
+ message(FATAL_ERROR "Could not find a main() symbol on ${TARGET}")
+endif()
