diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-20 14:33:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-06-20 14:39:37 (GMT) |
| commit | ab66b89a461810f612f69a3d8eb873cb08557a6a (patch) | |
| tree | ed93a0ef79233020671993bdb57429bfb1893876 | |
| parent | 21d409534a6ee884db9740f1e16f7d3d6bb950d8 (diff) | |
| download | CMake-ab66b89a461810f612f69a3d8eb873cb08557a6a.zip CMake-ab66b89a461810f612f69a3d8eb873cb08557a6a.tar.gz CMake-ab66b89a461810f612f69a3d8eb873cb08557a6a.tar.bz2 | |
Android: Restore platform id vars with legacy toolchain file
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
| -rw-r--r-- | Modules/Platform/Android-Initialize.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/Platform/Android-Initialize.cmake b/Modules/Platform/Android-Initialize.cmake index 2a2f6e2..e2b2bd5 100644 --- a/Modules/Platform/Android-Initialize.cmake +++ b/Modules/Platform/Android-Initialize.cmake @@ -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) |