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:13 (GMT) |
| commit | ba616fcb6ddc08a14d623d51ce49657c275f9d96 (patch) | |
| tree | 738c6ec1a251d6df8b2858abc699edaec2eab7eb /Modules/Platform | |
| parent | 3087b3dbac09f0a206bdc31fd9db2fba7821d0e4 (diff) | |
| parent | bfe4722a61a16f6fda6b1509610d07c8830967b4 (diff) | |
| download | CMake-ba616fcb6ddc08a14d623d51ce49657c275f9d96.zip CMake-ba616fcb6ddc08a14d623d51ce49657c275f9d96.tar.gz CMake-ba616fcb6ddc08a14d623d51ce49657c275f9d96.tar.bz2 | |
Merge topic 'android-platform'
bfe4722a61 Android: Restore platform info and search paths shared with Linux
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8626
Diffstat (limited to 'Modules/Platform')
| -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() |