f935cc7152
CMAKE_SYSTEM_NAME by default, then disable CMake's built-in NDK support when CMAKE_SYSTEM_NAME is set to Android.
20 lines
776 B
Diff
20 lines
776 B
Diff
diff --git a/Modules/Platform/Android/Determine-Compiler.cmake b/Modules/Platform/Android/Determine-Compiler.cmake
|
|
index a03ebcc29..34d527741 100644
|
|
--- a/Modules/Platform/Android/Determine-Compiler.cmake
|
|
+++ b/Modules/Platform/Android/Determine-Compiler.cmake
|
|
@@ -31,6 +31,14 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
|
|
set(_ANDROID_HOST_EXT "")
|
|
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
|
|
set(_ANDROID_HOST_EXT ".exe")
|
|
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")
|
|
+ macro(__android_determine_compiler lang)
|
|
+ # Do nothing
|
|
+ endmacro()
|
|
+ if(NOT CMAKE_CXX_COMPILER_NAMES)
|
|
+ set(CMAKE_CXX_COMPILER_NAMES c++)
|
|
+ endif()
|
|
+ return()
|
|
else()
|
|
message(FATAL_ERROR "Android: Builds hosted on '${CMAKE_HOST_SYSTEM_NAME}' not supported.")
|
|
endif()
|