diff options
| author | Christophe Calmejane <christophe.calmejane@l-acoustics.com> | 2020-11-19 00:45:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 15:45:05 -0800 |
| commit | ef77f3c99f02b9b0346b176c2b9fee49c99110e1 (patch) | |
| tree | 92e862066a8f82adf12ae13d90d8f7114d3bedab /scripts | |
| parent | e55c6e1b83cb0e08a85c89cd3ec46b64335230d5 (diff) | |
| download | vcpkg-ef77f3c99f02b9b0346b176c2b9fee49c99110e1.tar.gz vcpkg-ef77f3c99f02b9b0346b176c2b9fee49c99110e1.zip | |
[vcpkg android] Fix for issue #11927 (#14625)
Allow selection of Android SDK platform version from triplet file.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 2 | ||||
| -rw-r--r-- | scripts/toolchains/android.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index f41747f8a..9f71b2208 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -170,6 +170,8 @@ function(vcpkg_configure_cmake) list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") if(_TARGETTING_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 21) endif() endif() diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 6f6c98507..c721c2c42 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -1,8 +1,7 @@ -
set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "")
set(CMAKE_SYSTEM_NAME Android CACHE STRING "")
set(ANDROID_TOOLCHAIN clang CACHE STRING "")
-set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "")
+set(ANDROID_NATIVE_API_LEVEL ${CMAKE_SYSTEM_VERSION} CACHE STRING "")
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "")
if (VCPKG_TARGET_TRIPLET MATCHES "^arm64-android")
|