diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-28 21:58:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-28 21:58:54 (GMT) |
| commit | 19509249a539cce377e2f3f3b5271cc517d032a4 (patch) | |
| tree | 26e9ff525ff51b9096c8bfb05d219f9be71e6a76 /Modules/Platform/Android.cmake | |
| parent | 90907c8ff96ff07f0dafc1f4904d25b1e10f014b (diff) | |
| download | CMake-19509249a539cce377e2f3f3b5271cc517d032a4.zip CMake-19509249a539cce377e2f3f3b5271cc517d032a4.tar.gz CMake-19509249a539cce377e2f3f3b5271cc517d032a4.tar.bz2 | |
Android: Revert setting LINUX variable on Android target systems
Since commit 62cd3904bf (variable: Set LINUX variable on Linux target
systems, 2022-08-10, v3.25.0-rc1~320^2), the `Platform/Android` module
inherits the `LINUX` variable setting from `Platform/Linux`. While
Android may use a Linux kernel, `CMAKE_SYSTEM_NAME` is not `Linux`, and
the platform does not follow conventions of most Linux distributions.
Fixes: #24196
Diffstat (limited to 'Modules/Platform/Android.cmake')
| -rw-r--r-- | Modules/Platform/Android.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake index 09a12cc..d0f686c 100644 --- a/Modules/Platform/Android.cmake +++ b/Modules/Platform/Android.cmake @@ -5,6 +5,7 @@ if(CMAKE_ANDROID_NDK) endif() include(Platform/Linux) +unset(LINUX) set(ANDROID 1) |