diff --git a/src/apps/behaim/CMakeLists.txt b/src/apps/behaim/CMakeLists.txt --- a/src/apps/behaim/CMakeLists.txt +++ b/src/apps/behaim/CMakeLists.txt @@ -44,8 +44,8 @@ endif() get_filename_component(ABSOLUTE_INSTALL_PATH "${ABSOLUTE_INSTALL_PATH}" ABSOLUTE) get_filename_component(QT_ANDROID_QT_ROOT "${Qt5Core_DIR}/../../.." ABSOLUTE) - set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) - set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK}) + set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) + set(ANDROID_NDK_ROOT $ENV{ANDROID_NDK_ROOT}) set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so") set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") diff --git a/src/apps/behaim/package/deploy-behaim.json.in b/src/apps/behaim/package/deploy-behaim.json.in --- a/src/apps/behaim/package/deploy-behaim.json.in +++ b/src/apps/behaim/package/deploy-behaim.json.in @@ -1,8 +1,8 @@ { "description": "This file is to be read by androiddeployqt", "qt": "@QT_ANDROID_QT_ROOT@", - "sdk": "@QT_ANDROID_SDK_ROOT@", - "ndk": "@QT_ANDROID_NDK_ROOT@", + "sdk": "@ANDROID_SDK_ROOT@", + "ndk": "@ANDROID_NDK_ROOT@", "toolchain-prefix": "@ANDROID_TOOLCHAIN@", "tool-prefix": "@ANDROID_TOOLCHAIN@", "toolchain-version": "@ANDROID_GCC_VERSION@", diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt --- a/src/apps/marble-maps/CMakeLists.txt +++ b/src/apps/marble-maps/CMakeLists.txt @@ -44,8 +44,8 @@ endif() get_filename_component(ABSOLUTE_INSTALL_PATH "${ABSOLUTE_INSTALL_PATH}" ABSOLUTE) get_filename_component(QT_ANDROID_QT_ROOT "${Qt5Core_DIR}/../../.." ABSOLUTE) - set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) - set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK}) + set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT}) + set(ANDROID_NDK_ROOT $ENV{ANDROID_NDK_ROOT}) set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so") set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") diff --git a/src/apps/marble-maps/package/deploy-marble-maps.json.in b/src/apps/marble-maps/package/deploy-marble-maps.json.in --- a/src/apps/marble-maps/package/deploy-marble-maps.json.in +++ b/src/apps/marble-maps/package/deploy-marble-maps.json.in @@ -1,8 +1,8 @@ { "description": "This file is to be read by androiddeployqt", "qt": "@QT_ANDROID_QT_ROOT@", - "sdk": "@QT_ANDROID_SDK_ROOT@", - "ndk": "@QT_ANDROID_NDK_ROOT@", + "sdk": "@ANDROID_SDK_ROOT@", + "ndk": "@ANDROID_NDK_ROOT@", "toolchain-prefix": "@ANDROID_TOOLCHAIN@", "tool-prefix": "@ANDROID_TOOLCHAIN@", "toolchain-version": "@ANDROID_GCC_VERSION@",