mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 01:11:48 +08:00
c6043cde21
Fixes build errors on android due to wrong pthread flags and 32 bit API level requirements (`ftello`). Alternative to #39314.
19 lines
590 B
Diff
19 lines
590 B
Diff
diff --git a/source/cmake/FindNeon.cmake b/source/cmake/FindNeon.cmake
|
|
index cb02180..6a939b8 100644
|
|
--- a/source/cmake/FindNeon.cmake
|
|
+++ b/source/cmake/FindNeon.cmake
|
|
@@ -16,6 +16,13 @@ else()
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
endif()
|
|
|
|
+if(CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
|
|
+ set(neon_version 1)
|
|
+elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a")
|
|
+ set(neon_version "${CMAKE_ANDROID_ARM_NEON}")
|
|
+elseif(CMAKE_CROSSCOMPILING AND CMAKE_SIZEOF_VOID_P LESS "8")
|
|
+ set(neon_version 0)
|
|
+endif()
|
|
if(neon_version)
|
|
set(CPU_HAS_NEON 1)
|
|
endif()
|