[Cmake-commits] CMake branch, next, updated. v2.8.2-686-g09f1930
Brad King
brad.king at kitware.com
Tue Sep 7 08:48:59 EDT 2010
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 09f1930e2281919501ad71c3cf10a153555445d4 (commit)
via 11a917d04ee93b239f0be07cf4437364a0c85efb (commit)
from 84313c59960d7e5c0692b3fe6a7ee78743235b57 (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=09f1930e2281919501ad71c3cf10a153555445d4
commit 09f1930e2281919501ad71c3cf10a153555445d4
Merge: 84313c5 11a917d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 7 08:48:59 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 7 08:48:59 2010 -0400
Merge topic 'hpux-required-runtime-path-10571' into next
11a917d HP-UX: Always add /usr/lib to rpath (#10571)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11a917d04ee93b239f0be07cf4437364a0c85efb
commit 11a917d04ee93b239f0be07cf4437364a0c85efb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 7 08:44:19 2010 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 7 08:44:19 2010 -0400
HP-UX: Always add /usr/lib to rpath (#10571)
Set CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH in the HP-UX platform file to
tell CMake to pass -Wl,+b,/usr/lib no matter whether RPATH is enabled or
not. This corrects the behavior of -Wl,+nodefaultrpath to look in this
default library path as documented.
diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index f8893d8..9d357c9 100644
--- a/Modules/Platform/HP-UX.cmake
+++ b/Modules/Platform/HP-UX.cmake
@@ -1,3 +1,5 @@
+SET(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH /usr/lib)
+
SET(CMAKE_SHARED_LIBRARY_SUFFIX ".sl") # .so
SET(CMAKE_DL_LIBS "dld")
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".sl" ".so" ".a")
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/HP-UX.cmake | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list