diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-19 13:55:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-19 13:56:01 (GMT) |
| commit | a6eec2292336419d9c7211dec8977603c0e58b86 (patch) | |
| tree | dba5c6029664518a44f734f20d7ee785f8077edc /Modules | |
| parent | 8c7ac278cd5af00e0f6ec661635921af40ae3839 (diff) | |
| parent | 7e5b48a7b105707cba16fcc2c10f422df6d06c4f (diff) | |
| download | CMake-a6eec2292336419d9c7211dec8977603c0e58b86.zip CMake-a6eec2292336419d9c7211dec8977603c0e58b86.tar.gz CMake-a6eec2292336419d9c7211dec8977603c0e58b86.tar.bz2 | |
Merge topic 'android-path-suffixes'
7e5b48a7b1 Android: Avoid searching API level directories matching architecture bitness
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7805
Diffstat (limited to 'Modules')
| -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 6944e32..09a12cc 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) |