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:19 (GMT) |
| commit | 92fe99a0d022de967f2c35b5f50b26f322d4f525 (patch) | |
| tree | ff266d4210cf61cf1e6b89bc8108c7b88e7e74eb /Modules | |
| parent | 8830dd381cc367c506b688fdebbde87179c227e5 (diff) | |
| parent | 988b9928e46f22d4e51cfe259991c9c5378bc24b (diff) | |
| download | CMake-92fe99a0d022de967f2c35b5f50b26f322d4f525.zip CMake-92fe99a0d022de967f2c35b5f50b26f322d4f525.tar.gz CMake-92fe99a0d022de967f2c35b5f50b26f322d4f525.tar.bz2 | |
Merge topic 'ArchLinux-lib-dir'
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() |