mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'android-platform-vars' into release-3.27

Browse Source 
ab66b89a46 Android: Restore platform id vars with legacy toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8576
This commit is contained in:
Brad King
2023-06-20 17:09:21 +00:00
committed by Kitware Robot
parent f342a655e4 ab66b89a46
commit fd949f6e01
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/Platform/Android-Initialize.cmake
View File

@@ -10,6 +10,11 @@ if(CMAKE_ANDROID_NDK)
include(${CMAKE_ANDROID_NDK}/build/cmake/hooks/pre/Android-Initialize.cmake OPTIONAL)
endif()
include(Platform/Linux-Initialize)
unset(LINUX)
set(ANDROID 1)
# Support for NVIDIA Nsight Tegra Visual Studio Edition was previously
# implemented in the CMake VS IDE generators. Avoid interfering with
# that functionality for now.
@@ -23,11 +28,6 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1)
return()
endif()
include(Platform/Linux-Initialize)
unset(LINUX)
set(ANDROID 1)
set(CMAKE_BUILD_TYPE_INIT "RelWithDebInfo")
if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED)