diff options
| author | Brad King <brad.king@kitware.com> | 2023-07-14 12:32:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-07-14 12:33:12 (GMT) |
| commit | dbbbedb3af7203c36d457450071ee0e195eaf994 (patch) | |
| tree | e63178ac3388152434977a989b3c38e165ae55c4 | |
| parent | d769c59d783f0ffc46d61bb4715b5fb3a68181a8 (diff) | |
| parent | bfe4722a61a16f6fda6b1509610d07c8830967b4 (diff) | |
| download | CMake-dbbbedb3af7203c36d457450071ee0e195eaf994.zip CMake-dbbbedb3af7203c36d457450071ee0e195eaf994.tar.gz CMake-dbbbedb3af7203c36d457450071ee0e195eaf994.tar.bz2 | |
Merge topic 'android-platform' into release-3.27
bfe4722a61 Android: Restore platform info and search paths shared with Linux
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8626
| -rw-r--r-- | Modules/Platform/Android.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake index f490f0e..a240aff 100644 --- a/Modules/Platform/Android.cmake +++ b/Modules/Platform/Android.cmake @@ -4,6 +4,8 @@ if(CMAKE_ANDROID_NDK) include(${CMAKE_ANDROID_NDK}/build/cmake/hooks/pre/Android.cmake OPTIONAL) endif() +include(Platform/Linux) + # Natively compiling on an Android host doesn't need these flags to be reset. if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android") return() |