From 7e5b48a7b105707cba16fcc2c10f422df6d06c4f Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Tue, 18 Oct 2022 19:07:57 +0200 Subject: Android: Avoid searching API level directories matching architecture bitness When cross-compiling for Android, the library path suffixes `//` refer to API level specific platform libraries instead of architecture bitness. Disable path suffix use under NDK to avoid incorrect inclusion of API level specific libraries below the targeted API level. Fixes: #23830 --- Modules/Platform/Android.cmake | 6 ++++++ 1 file changed, 6 insertions(+) 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) -- cgit v0.12