diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-26 15:04:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-26 18:17:07 (GMT) |
| commit | 4e6c58d937564c6692a86a958ca75a0f1def582d (patch) | |
| tree | 914d97e90164791bcc761c4ac002981ddefb5d2a /Modules/Platform/Android/Determine-Compiler.cmake | |
| parent | 8ce189720ee8daafed4848ee9eb970f9e0546578 (diff) | |
| download | CMake-4e6c58d937564c6692a86a958ca75a0f1def582d.zip CMake-4e6c58d937564c6692a86a958ca75a0f1def582d.tar.gz CMake-4e6c58d937564c6692a86a958ca75a0f1def582d.tar.bz2 | |
Android: Select NDK host tag while determining system
The host tag is tied to the host platform and does not depend on any
specific language or compiler.
Diffstat (limited to 'Modules/Platform/Android/Determine-Compiler.cmake')
| -rw-r--r-- | Modules/Platform/Android/Determine-Compiler.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Modules/Platform/Android/Determine-Compiler.cmake b/Modules/Platform/Android/Determine-Compiler.cmake index a03ebcc..5c6b97b 100644 --- a/Modules/Platform/Android/Determine-Compiler.cmake +++ b/Modules/Platform/Android/Determine-Compiler.cmake @@ -40,7 +40,6 @@ if(CMAKE_ANDROID_NDK) elseif(CMAKE_ANDROID_STANDALONE_TOOLCHAIN) include(Platform/Android/Determine-Compiler-Standalone) else() - set(_ANDROID_TOOL_NDK_TOOLCHAIN_HOST_TAG "") set(_ANDROID_TOOL_NDK_TOOLCHAIN_VERSION "") set(_ANDROID_TOOL_C_COMPILER "") set(_ANDROID_TOOL_C_TOOLCHAIN_MACHINE "") @@ -65,7 +64,6 @@ macro(__android_determine_compiler lang) # Save the Android-specific information in CMake${lang}Compiler.cmake. set(CMAKE_${lang}_COMPILER_CUSTOM_CODE " -set(CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG \"${_ANDROID_TOOL_NDK_TOOLCHAIN_HOST_TAG}\") set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION \"${_ANDROID_TOOL_NDK_TOOLCHAIN_VERSION}\") set(CMAKE_${lang}_ANDROID_TOOLCHAIN_MACHINE \"${_ANDROID_TOOL_${lang}_TOOLCHAIN_MACHINE}\") set(CMAKE_${lang}_ANDROID_TOOLCHAIN_VERSION \"${_ANDROID_TOOL_${lang}_TOOLCHAIN_VERSION}\") |