[Marble-devel] Review Request 125176: Cleanup Android build and make compatible with ECM

[Dennis Nienhüser]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125176/#review85231
-----------------------------------------------------------


It works when adding
if(CMAKE_SYSTEM_NAME STREQUAL Android)
  add_definitions(-DANDROID)
endif()

to the root CMakeLists.txt and adding this patch on top:

diff --git a/src/apps/marble-maps/package/deploy-marble-maps.json.in b/src/apps/marble-maps/package/deploy-marble-maps.json.in
index 3a28e7d..0f1fb90 100644
--- a/src/apps/marble-maps/package/deploy-marble-maps.json.in
+++ b/src/apps/marble-maps/package/deploy-marble-maps.json.in
@@ -3,10 +3,10 @@
  "qt": "@QT_ANDROID_QT_ROOT@",
  "sdk": "@QT_ANDROID_SDK_ROOT@",
  "ndk": "@QT_ANDROID_NDK_ROOT@",
- "toolchain-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@",
- "tool-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@",
- "toolchain-version": "@ANDROID_COMPILER_VERSION@",
- "ndk-host": "@ANDROID_NDK_HOST_SYSTEM_NAME@",
+ "toolchain-prefix": "@ANDROID_TOOLCHAIN@",
+ "tool-prefix": "@ANDROID_TOOLCHAIN@",
+ "toolchain-version": "@ANDROID_GCC_VERSION@",
+ "ndk-host": "@_HOST@",
  "target-architecture": "@ANDROID_ABI@",
  "application-binary": "@QT_ANDROID_APP_PATH@",
  "android-package": "@QT_ANDROID_APP_PACKAGE_NAME@",

- Dennis Nienhüser


On Sept. 11, 2015, 9:45 p.m., Andreas Cord-Landwehr wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125176/
> -----------------------------------------------------------
> 
> (Updated Sept. 11, 2015, 9:45 p.m.)
> 
> 
> Review request for Marble and Aleix Pol Gonzalez.
> 
> 
> Repository: marble
> 
> 
> Description
> -------
> 
> Change to proper use of CMAKE_SYSTEM_NAME, which is required by the ECM toolchain. After this change, Marble-Maps can be build by the command:
> 
> cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/ECM/toolchain/Android.cmake\
>   -DCMAKE_PREFIX_PATH=/path/to/5.5/android_armv7/\
>   -DQT_NO_WEBKIT=TRUE -DQT_NO_PRINTER=TRUE -DQT_NO_DBUS=TRUE ../marble
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 570be7f 
>   src/apps/CMakeLists.txt 5f71ced 
>   src/apps/marble-maps/CMakeLists.txt 670d6cb 
>   src/lib/astro/CMakeLists.txt a26a99d 
>   src/lib/marble/CMakeLists.txt 4c2da41 
>   src/plugins/CMakeLists.txt abb756d 
> 
> Diff: https://git.reviewboard.kde.org/r/125176/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Andreas Cord-Landwehr
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20150912/e1a9ede2/attachment.html>