f935cc7152
CMAKE_SYSTEM_NAME by default, then disable CMake's built-in NDK support when CMAKE_SYSTEM_NAME is set to Android.
16 lines
538 B
Diff
16 lines
538 B
Diff
diff --git a/Modules/Platform/Android-Initialize.cmake b/Modules/Platform/Android-Initialize.cmake
|
|
index a434f90ea..407ed3358 100644
|
|
--- a/Modules/Platform/Android-Initialize.cmake
|
|
+++ b/Modules/Platform/Android-Initialize.cmake
|
|
@@ -17,6 +17,10 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1)
|
|
return()
|
|
endif()
|
|
|
|
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")
|
|
+ return()
|
|
+endif()
|
|
+
|
|
if(NOT CMAKE_SYSROOT)
|
|
if(CMAKE_ANDROID_NDK)
|
|
set(CMAKE_SYSROOT "${CMAKE_ANDROID_NDK}/platforms/android-${CMAKE_SYSTEM_VERSION}/arch-${CMAKE_ANDROID_ARCH}")
|