f935cc7152
CMAKE_SYSTEM_NAME by default, then disable CMake's built-in NDK support when CMAKE_SYSTEM_NAME is set to Android.
14 lines
667 B
Diff
14 lines
667 B
Diff
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
|
|
index dc208c600..f3ec4da2d 100644
|
|
--- a/Modules/CMakeDetermineSystem.cmake
|
|
+++ b/Modules/CMakeDetermineSystem.cmake
|
|
@@ -43,7 +43,7 @@ if(CMAKE_HOST_UNIX)
|
|
else()
|
|
exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
|
|
endif()
|
|
- if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$")
|
|
+ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$|Android")
|
|
exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
|
|
RETURN_VALUE val)
|
|
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND
|