From 19509249a539cce377e2f3f3b5271cc517d032a4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 28 Nov 2022 16:58:54 -0500 Subject: 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 --- Modules/Platform/Android.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'Modules/Platform') diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake index 09a12ccb55..d0f686cb03 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) -- cgit v1.2.1