diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-31 13:45:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-31 13:46:18 (GMT) |
| commit | 628d1c339650598c91f77d5b47429571d40dedb7 (patch) | |
| tree | 0cb224b3f6b4f5402ced2fb19872f678de657ba0 /Modules | |
| parent | bb171688c91fce95405e4b91db8faad020c270f3 (diff) | |
| parent | 988b9928e46f22d4e51cfe259991c9c5378bc24b (diff) | |
| download | CMake-628d1c339650598c91f77d5b47429571d40dedb7.zip CMake-628d1c339650598c91f77d5b47429571d40dedb7.tar.gz CMake-628d1c339650598c91f77d5b47429571d40dedb7.tar.bz2 | |
Merge topic 'ArchLinux-lib-dir' into release-3.25
988b9928e4 Linux: Avoid finding libraries using lib64 on ArchLinux
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Felix Yan <felixonmars@archlinux.org>
Merge-request: !7849
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Linux.cmake | 11 |
1 files 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() |