diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-18 14:22:17 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-10-18 14:22:17 -0400 |
| commit | 263d733a58c73a8a8ef2158cae79949144e855f1 (patch) | |
| tree | 435e4c0f75971e085e12d9e3eeecad0ef34181ec | |
| parent | 9fefa9ef49061c7fc572bb21e37a2349d716a860 (diff) | |
| parent | 7e5b48a7b105707cba16fcc2c10f422df6d06c4f (diff) | |
| download | cmake-263d733a58c73a8a8ef2158cae79949144e855f1.tar.gz | |
Merge branch 'android-path-suffixes' into release-3.24
Merge-request: !7805
| -rw-r--r-- | Modules/Platform/Android.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake index 6944e32200..09a12ccb55 100644 --- a/Modules/Platform/Android.cmake +++ b/Modules/Platform/Android.cmake @@ -13,6 +13,12 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android") return() endif() +# NDK organizes API level specific libraries in numbered subdirectories. To +# avoid incorrect inclusion of libraries below the targeted API level, disable +# architecture specific path suffixes by default. +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF) + # Conventionally Android does not use versioned soname # But in modern versions it is acceptable if(NOT DEFINED CMAKE_PLATFORM_NO_VERSIONED_SONAME) |