summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-06-24 13:29:24 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-06-24 13:29:52 (GMT)
commit05b4883bfefa77312b44d028b19469fe51ff92c7 (patch)
treed558219b3b1fd9f59583c1a175b9c489a8f683da
parentd395fb38e5eddb567c116067e12fcbe680894088 (diff)
parente74fba3d9cf2f6930732344e84a4086d707e6c17 (diff)
downloadCMake-05b4883bfefa77312b44d028b19469fe51ff92c7.zip
CMake-05b4883bfefa77312b44d028b19469fe51ff92c7.tar.gz
CMake-05b4883bfefa77312b44d028b19469fe51ff92c7.tar.bz2
Merge topic 'find_library-per-arch-lib-with-sysroot'
e74fba3d9c find_library: Search per-arch lib directories when compiling with sysroot Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9614
-rw-r--r--Modules/Platform/Linux.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
index b9801ee..a73bbf7 100644
--- a/Modules/Platform/Linux.cmake
+++ b/Modules/Platform/Linux.cmake
@@ -84,7 +84,7 @@ include(Platform/UnixPaths)
# Debian has lib32 and lib64 paths only for compatibility so they should not be
# searched.
-if(NOT CMAKE_CROSSCOMPILING)
+if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_COMPILER_SYSROOT)
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)