From 988b9928e46f22d4e51cfe259991c9c5378bc24b Mon Sep 17 00:00:00 2001 From: Letu Ren Date: Sun, 30 Oct 2022 10:07:18 +0100 Subject: Linux: Avoid finding libraries using lib64 on ArchLinux ArchLinux uses `/lib` for 64-bit libraries and there is no `/lib64`. However, unlike Debian, 32-bit libraries are in `/lib32`. --- Modules/Platform/Linux.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake index e3d444e..3dc3ca3 100644 --- a/Modules/Platform/Linux.cmake +++ b/Modules/Platform/Linux.cmake @@ -87,7 +87,12 @@ include(Platform/UnixPaths) # Debian has lib32 and lib64 paths only for compatibility so they should not be # searched. -if(NOT CMAKE_CROSSCOMPILING AND EXISTS "/etc/debian_version") - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +if(NOT CMAKE_CROSSCOMPILING) + if (EXISTS "/etc/debian_version") + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) + endif() + if (EXISTS "/etc/arch-release") + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) + endif() endif() -- cgit v0.12