diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-20 17:09:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-20 17:09:58 (GMT) |
| commit | fd949f6e01251da1bc5eee4d34500a2556bef312 (patch) | |
| tree | e022d6e7d842d0c04211743b5d84ccb53e3485f7 | |
| parent | f342a655e43d05f553dbbd49d48721ac41469424 (diff) | |
| parent | ab66b89a461810f612f69a3d8eb873cb08557a6a (diff) | |
| download | CMake-fd949f6e01251da1bc5eee4d34500a2556bef312.zip CMake-fd949f6e01251da1bc5eee4d34500a2556bef312.tar.gz CMake-fd949f6e01251da1bc5eee4d34500a2556bef312.tar.bz2 | |
Merge topic 'android-platform-vars' into release-3.27
ab66b89a46 Android: Restore platform id vars with legacy toolchain file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8576
| -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) |