echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Restore platform id vars with legacy toolchain file

Browse Source 
Restore definition of `ANDROID` and `UNIX` when `CMAKE_SYSTEM_VERSION`
is `1`.  This was broken by commit 1373373823 (enable_language:
Establish target platform identification variables earlier, 2023-06-06,
v3.27.0-rc1~3^2~1).

Fixes: #25004
This commit is contained in:
Brad King 2023-06-20 10:33:53 -04:00
parent 21d409534a
commit ab66b89a46
1 changed files with 5 additions and 5 deletions
Show Stats 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) include(${CMAKE_ANDROID_NDK}/build/cmake/hooks/pre/Android-Initialize.cmake OPTIONAL)
endif() endif()
include(Platform/Linux-Initialize)
unset(LINUX)
set(ANDROID 1)
# Support for NVIDIA Nsight Tegra Visual Studio Edition was previously # Support for NVIDIA Nsight Tegra Visual Studio Edition was previously
# implemented in the CMake VS IDE generators. Avoid interfering with # implemented in the CMake VS IDE generators. Avoid interfering with
# that functionality for now. # that functionality for now.
@ -23,11 +28,6 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1)
return() return()
endif() endif()
include(Platform/Linux-Initialize)
unset(LINUX)
set(ANDROID 1)
set(CMAKE_BUILD_TYPE_INIT "RelWithDebInfo") set(CMAKE_BUILD_TYPE_INIT "RelWithDebInfo")
if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED) if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED)