This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2a4db6f9af6370a9681eb0cc9f2528c0b1080321 (commit)
via cc57ff5c496e280d93a842909d2c739cfbb5ba93 (commit)
from a0f4f14a0dda529004b6d605eca780c5eb8d5d32 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a4db6f9af6370a9681eb0cc9f2528c0b1080321
commit 2a4db6f9af6370a9681eb0cc9f2528c0b1080321
Merge: a0f4f14 cc57ff5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Apr 16 11:46:55 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Apr 16 11:46:55 2014 -0400
Merge topic 'implicit-libNN-dirs' into next
cc57ff5c Drop /lib32 and /lib64 from link directories and RPATH (#14875)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc57ff5c496e280d93a842909d2c739cfbb5ba93
commit cc57ff5c496e280d93a842909d2c739cfbb5ba93
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Apr 16 11:35:31 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Apr 16 11:40:48 2014 -0400
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.
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
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/UnixPaths.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
