diff options
author | Brad King <brad.king@kitware.com> | 2022-11-29 15:24:13 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-29 15:24:22 (GMT) |
commit | 44f2c8f1a4da124fe0c9acad9fbd826ef8b4c868 (patch) | |
tree | 07ab93a8ad0bd2047f05c7eb22ebc7d6d92f4fda /Modules/Platform | |
parent | dd9d1a27a42fbc9467e453a2da5b663e6d4a8584 (diff) | |
parent | 19509249a539cce377e2f3f3b5271cc517d032a4 (diff) | |
download | CMake-44f2c8f1a4da124fe0c9acad9fbd826ef8b4c868.zip CMake-44f2c8f1a4da124fe0c9acad9fbd826ef8b4c868.tar.gz CMake-44f2c8f1a4da124fe0c9acad9fbd826ef8b4c868.tar.bz2 |
Merge topic 'android-no-LINUX'
19509249a5 Android: Revert setting LINUX variable on Android target systems
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Nevala <robert.nevala@king.com>
Acked-by: n00b42 <github.com@mail.msdigital.de>
Merge-request: !7963
Diffstat (limited to 'Modules/Platform')
-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) |