summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-16 15:35:31 (GMT)
committerBrad King <brad.king@kitware.com>2014-04-16 15:40:48 (GMT)
commitcc57ff5c496e280d93a842909d2c739cfbb5ba93 (patch)
treed6d6fdd38d970175868e048889485e3c179fd6d0
parenta48de7d8506325e7f27c9dada578744e1ff3fb35 (diff)
downloadCMake-cc57ff5c496e280d93a842909d2c739cfbb5ba93.zip
CMake-cc57ff5c496e280d93a842909d2c739cfbb5ba93.tar.gz
CMake-cc57ff5c496e280d93a842909d2c739cfbb5ba93.tar.bz2
Drop /lib32 and /lib64 from link directories and RPATH (#14875)
Extend CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES with these paths. We already have the equivalents under /usr. Systems that have these directories have their dynamic loaders configured already. Do not allow them to appear in the RPATH explicitly.
-rw-r--r--Modules/Platform/UnixPaths.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index eca3280..20ee1d1 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -83,7 +83,7 @@ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
)
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
- /lib /usr/lib /usr/lib32 /usr/lib64
+ /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
)
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES