From 5b39c909baeb3e4c247a43b91a884d5990c99092 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Fri, 6 Feb 2015 01:24:23 +0100 Subject: Move Android toolchain module to ECM Introduces the new Android toolchain file for being able to easily compile our cmake projects in Android, with an emphasis on Qt projects. CHANGELOG: New Android toolchain support module. REVIEW: 121545 --- toolchain/deployment-file.json.in | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 toolchain/deployment-file.json.in (limited to 'toolchain/deployment-file.json.in') diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in new file mode 100644 index 00000000..e662795a --- /dev/null +++ b/toolchain/deployment-file.json.in @@ -0,0 +1,15 @@ +{ + "qt": "@QTDIR@", + "sdk": "@ANDROID_SDK_ROOT@", + "ndk": "@ANDROID_NDK@", + "toolchain-prefix": "@ANDROID_TOOLCHAIN@", + "tool-prefix": "@ANDROID_TOOLCHAIN@", + "toolchain-version": "@ANDROID_GCC_VERSION@", + "ndk-host": "@_HOST@", + "target-architecture": "@ANDROID_ABI@", + "application-binary": "@EXECUTABLE_DESTINATION_PATH@", + "android-extra-libs": "@_DEPS@", + "android-extra-plugins": "@CMAKE_PREFIX_PATH@/share,@CMAKE_PREFIX_PATH@/lib/qml", + "android-package-source-directory": "@ANDROID_APK_DIR@", + "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@" +} -- cgit v1.2.1 From 3915bacd6055087bf71ccabc5c9ddf15743f4e9a Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Sun, 13 Sep 2015 01:57:58 +0200 Subject: Use Qt5 to specify what's Qt5 installation prefix --- toolchain/deployment-file.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/deployment-file.json.in') diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index e662795a..1e52e5a0 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -1,5 +1,5 @@ { - "qt": "@QTDIR@", + "qt": "@_qt5Core_install_prefix@", "sdk": "@ANDROID_SDK_ROOT@", "ndk": "@ANDROID_NDK@", "toolchain-prefix": "@ANDROID_TOOLCHAIN@", -- cgit v1.2.1 From 94c9958d41b145124ba5c96777f29e8eb81df160 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Sun, 13 Sep 2015 02:04:07 +0200 Subject: Look for the files in the installed prefix rather the prefix path In general, we are looking for what we're installing, not for what we already had. --- toolchain/deployment-file.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/deployment-file.json.in') diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 1e52e5a0..8534cd2f 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -9,7 +9,7 @@ "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", "android-extra-libs": "@_DEPS@", - "android-extra-plugins": "@CMAKE_PREFIX_PATH@/share,@CMAKE_PREFIX_PATH@/lib/qml", + "android-extra-plugins": "@CMAKE_INSTALL_PREFIX@/share,@CMAKE_INSTALL_PREFIX@/lib/qml", "android-package-source-directory": "@ANDROID_APK_DIR@", "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@" } -- cgit v1.2.1 From 3b20ef911eb83b7bd37315ace682e0e6bc6195d9 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 1 Oct 2015 01:25:03 +0200 Subject: Remove workaround to delay execution on Android * Remove get_property calls on targets, this way we don't need to be called right before configuration time. * Removes EOFHook Instead we process it at generation time using the link.txt file (which is probably another hack) REVIEW: 125084 --- toolchain/deployment-file.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolchain/deployment-file.json.in') diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 8534cd2f..9367bc1b 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -8,7 +8,7 @@ "ndk-host": "@_HOST@", "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", - "android-extra-libs": "@_DEPS@", + "android-extra-libs": "##EXTRALIBS##", "android-extra-plugins": "@CMAKE_INSTALL_PREFIX@/share,@CMAKE_INSTALL_PREFIX@/lib/qml", "android-package-source-directory": "@ANDROID_APK_DIR@", "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@" -- cgit v1.2.1