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:21 (GMT) |
| commit | 7eb3cb19bca7dcc9c6af66c52a277101185d0c64 (patch) | |
| tree | 67bc027d938f8d4186c0cb6b48d9a9a9d225948a /Modules/Platform | |
| parent | 51235d14eb95883d5afa8baec85f32f374eed874 (diff) | |
| parent | 19509249a539cce377e2f3f3b5271cc517d032a4 (diff) | |
| download | CMake-7eb3cb19bca7dcc9c6af66c52a277101185d0c64.zip CMake-7eb3cb19bca7dcc9c6af66c52a277101185d0c64.tar.gz CMake-7eb3cb19bca7dcc9c6af66c52a277101185d0c64.tar.bz2 | |
Merge topic 'android-no-LINUX' into release-3.25
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) |