mirror of https://github.com/microsoft/vcpkg.git
Compile for android including armv6. (#16847)
* compile for android including armv6. * Update arm-android.cmake * Update from comment in the PR support ANDROID_NATIVE_API_LEVEL from env variable. (to be able to compile also 16 and not just 21 as default) * Add ANDROID_ARM_NEON from env var * Short version of update ANDROID_ARM_NEON. * remove ANDROID_NATIVE_API_LEVEL now using vcpkg_CMAKE_SYSTEM_VERSION in triplet Add cache to ANDROID_ARM_NEON fix indents * Update neon triplet * Add arm-neon-android.cmake file.
This commit is contained in:
parent
706ab2a279
commit
27fe7a50db
|
|
@ -6,8 +6,14 @@ set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "")
|
|||
|
||||
if (VCPKG_TARGET_TRIPLET MATCHES "^arm64-android")
|
||||
set(ANDROID_ABI arm64-v8a CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_TRIPLET MATCHES "^armv6-android")
|
||||
set(ANDROID_ABI armeabi CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_TRIPLET MATCHES "^arm-neon-android")
|
||||
set(ANDROID_ABI armeabi-v7a CACHE STRING "")
|
||||
set(ANDROID_ARM_NEON ON CACHE BOOL "")
|
||||
elseif(VCPKG_TARGET_TRIPLET MATCHES "^arm-android")
|
||||
set(ANDROID_ABI armeabi-v7a CACHE STRING "")
|
||||
set(ANDROID_ARM_NEON OFF CACHE BOOL "")
|
||||
elseif(VCPKG_TARGET_TRIPLET MATCHES "^x64-android")
|
||||
set(ANDROID_ABI x86_64 CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_TRIPLET MATCHES "^x86-android")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm)
|
||||
set(VCPKG_CRT_LINKAGE static)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Android)
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm)
|
||||
set(VCPKG_CRT_LINKAGE static)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Android)
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
||||
set(VCPKG_CRT_LINKAGE static)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Android)
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE arm)
|
||||
set(VCPKG_CRT_LINKAGE static)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Android)
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE x64)
|
||||
set(VCPKG_CRT_LINKAGE static)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Android)
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
set(VCPKG_TARGET_ARCHITECTURE x86)
|
||||
set(VCPKG_CRT_LINKAGE static)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Android)
|
||||
Loading…
Reference in New Issue