Changeset View
Changeset View
Standalone View
Standalone View
toolchain/Android.cmake
Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s) | 139 | macro(set_deprecated_variable actual_variable deprecated_variable default_value) | |||
---|---|---|---|---|---|
140 | set(${deprecated_variable} "${default_value}" CACHE STRING "Deprecated. Use ${actual_variable}") | 140 | set(${deprecated_variable} "${default_value}" CACHE STRING "Deprecated. Use ${actual_variable}") | ||
141 | if (NOT DEFINED ${actual_variable}) | 141 | if (NOT DEFINED ${actual_variable}) | ||
142 | set(${actual_variable} ${${deprecated_variable}}) | 142 | set(${actual_variable} ${${deprecated_variable}}) | ||
143 | endif() | 143 | endif() | ||
144 | endmacro() | 144 | endmacro() | ||
145 | 145 | | |||
146 | set_deprecated_variable(CMAKE_ANDROID_NDK ANDROID_NDK "$ENV{ANDROID_NDK}") | 146 | set_deprecated_variable(CMAKE_ANDROID_NDK ANDROID_NDK "$ENV{ANDROID_NDK}") | ||
147 | set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE "arm") | 147 | set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE "arm") | ||
148 | set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION ANDROID_GCC_VERSION "4.9") | 148 | set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION ANDROID_GCC_VERSION "clang") | ||
149 | set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a") | 149 | set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a") | ||
150 | set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "14") | 150 | set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "21") | ||
jjazeix: Sorry, I'm a bit late, but would it be possible to put 16 as minimum here? Some projects… | |||||
151 | 151 | | |||
152 | set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path") | 152 | set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE path "Android SDK path") | ||
153 | 153 | | |||
154 | file(GLOB build-tools LIST_DIRECTORIES TRUE RELATIVE ${ANDROID_SDK_ROOT}/build-tools ${ANDROID_SDK_ROOT}/build-tools/*) | 154 | file(GLOB build-tools LIST_DIRECTORIES TRUE RELATIVE ${ANDROID_SDK_ROOT}/build-tools ${ANDROID_SDK_ROOT}/build-tools/*) | ||
155 | list(GET build-tools 0 _default_sdk) | 155 | list(GET build-tools 0 _default_sdk) | ||
156 | set(ANDROID_SDK_BUILD_TOOLS_REVISION "${_default_sdk}" CACHE string "Android API Level") | 156 | set(ANDROID_SDK_BUILD_TOOLS_REVISION "${_default_sdk}" CACHE string "Android API Level") | ||
157 | 157 | | |||
158 | set(CMAKE_SYSTEM_VERSION ${CMAKE_ANDROID_API}) | 158 | set(CMAKE_SYSTEM_VERSION ${CMAKE_ANDROID_API}) | ||
159 | set(CMAKE_SYSTEM_NAME Android) | 159 | set(CMAKE_SYSTEM_NAME Android) | ||
160 | if (NOT CMAKE_ANDROID_STL_TYPE) | 160 | if (NOT CMAKE_ANDROID_STL_TYPE) | ||
161 | set(CMAKE_ANDROID_STL_TYPE gnustl_shared) | 161 | set(CMAKE_ANDROID_STL_TYPE c++_shared) | ||
162 | endif() | 162 | endif() | ||
163 | 163 | | |||
164 | include(${CMAKE_ROOT}/Modules/Platform/Android-GNU.cmake REQUIRED) | 164 | include(${CMAKE_ROOT}/Modules/Platform/Android-GNU.cmake REQUIRED) | ||
165 | include(${CMAKE_ROOT}/Modules/Platform/Android-Initialize.cmake REQUIRED) | 165 | include(${CMAKE_ROOT}/Modules/Platform/Android-Initialize.cmake REQUIRED) | ||
166 | 166 | | |||
167 | if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH) | 167 | if (NOT DEFINED ECM_ADDITIONAL_FIND_ROOT_PATH) | ||
168 | SET(ECM_ADDITIONAL_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH}) | 168 | SET(ECM_ADDITIONAL_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH}) | ||
169 | endif() | 169 | endif() | ||
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines |
Sorry, I'm a bit late, but would it be possible to put 16 as minimum here? Some projects (GCompris at least) do not use KF5 and would like to target lower API levels.
I can do the diff/commit to change it if necessary