summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeDetermineSystem.cmake
diff options
context:
space:
mode:
authorButta <gl@butta.fastem.com>2019-10-15 07:54:02 (GMT)
committerButta <gl@butta.fastem.com>2019-10-15 15:43:51 (GMT)
commitc5892e484e21f49abf2afd138dddd6720bf91adc (patch)
tree71895167fb4b068785a68f06c0a5ca339df57eca /Modules/CMakeDetermineSystem.cmake
parentdaf6a6ba68a6fa1c5d1956f151104d903f3447cc (diff)
downloadCMake-c5892e484e21f49abf2afd138dddd6720bf91adc.zip
CMake-c5892e484e21f49abf2afd138dddd6720bf91adc.tar.gz
CMake-c5892e484e21f49abf2afd138dddd6720bf91adc.tar.bz2
Android: add support for native compilation, such as with the Termux app
The CMake support for Android assumes cross-compilation using the NDK, so stub out that Android NDK support and use the Linux support that's already invoked. Set CMAKE_HOST_SYSTEM_NAME to "Android", rather than "Linux". Issue: #19840
Diffstat (limited to 'Modules/CMakeDetermineSystem.cmake')
-rw-r--r--Modules/CMakeDetermineSystem.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index dc208c6..f3ec4da 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