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 de0bd3ff7a4097961fe1b529f2723d6009ac403b (commit)
via 5993891e8d3092375f4409e8d07f5138a1cb55be (commit)
from d7d3a5b134e890055a3cf79cb27df612eda6704f (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=de0bd3ff7a4097961fe1b529f2723d6009ac403b
commit de0bd3ff7a4097961fe1b529f2723d6009ac403b
Merge: d7d3a5b 5993891
Author: Todd Gamblin <tgamb...@llnl.gov>
AuthorDate: Mon Aug 29 10:01:52 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 29 10:01:52 2011 -0400
Merge topic 'bg-link-fixes' into next
5993891 Fixed link bugs in BlueGeneP build.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5993891e8d3092375f4409e8d07f5138a1cb55be
commit 5993891e8d3092375f4409e8d07f5138a1cb55be
Author: Todd Gamblin <tgamb...@llnl.gov>
AuthorDate: Sun Aug 28 21:54:45 2011 -0700
Commit: Todd Gamblin <tgamb...@llnl.gov>
CommitDate: Sun Aug 28 22:08:11 2011 -0700
Fixed link bugs in BlueGeneP build.
- Build wasn't properly using -soname linker args, so installed libraries
could depend on relative paths from the build directory.
- Consolidated GNU linker args to one place in the BlueGeneP-base platform
file, since ld is used by both XL and GNU toolchains on BlueGene.
diff --git a/Modules/Platform/BlueGeneP-base.cmake
b/Modules/Platform/BlueGeneP-base.cmake
index 2ca920f..926dbc0 100644
--- a/Modules/Platform/BlueGeneP-base.cmake
+++ b/Modules/Platform/BlueGeneP-base.cmake
@@ -85,20 +85,23 @@ set(CMAKE_DL_LIBS "dl")
macro(__BlueGeneP_set_dynamic_flags compiler_id lang)
if (${compiler_id} STREQUAL XL)
# Flags for XL compilers if we explicitly detected XL
- set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-qpic")
# -pic
- set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-qmkshrobj -qnostaticlink")
# -shared
- set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-rpath,")
# -rpath
- set(BGP_${lang}_DYNAMIC_EXE_FLAGS "-qnostaticlink -qnostaticlink=libgcc")
+ set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-qpic")
+ set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-qmkshrobj
-qnostaticlink")
+ set(BGP_${lang}_DYNAMIC_EXE_FLAGS "-qnostaticlink
-qnostaticlink=libgcc")
else()
# Assume flags for GNU compilers (if the ID is GNU *or* anything else).
- set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC") # -pic
- set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared") # -shared
- set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-rpath,") # -rpath
- set(BGP_${lang}_DYNAMIC_EXE_FLAGS "-dynamic")
+ set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
+ set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
+ set(BGP_${lang}_DYNAMIC_EXE_FLAGS "-dynamic")
endif()
- set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "") # +s, flag for exe
link to use shared lib
- set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") # : or empty
+ # Both toolchains use the GNU linker on BG/P, so these options are shared.
+ set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-rpath,")
+ set(CMAKE_SHARED_LIBRARY_RPATH_LINK_${lang}_FLAG "-Wl,-rpath-link,")
+ set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,-soname,")
+ set(CMAKE_EXE_EXPORTS_${lang}_FLAG "-Wl,--export-dynamic")
+ set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "") # +s, flag for exe
link to use shared lib
+ set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") # : or empty
set(BGP_${lang}_DEFAULT_EXE_FLAGS
"<FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET>
<LINK_LIBRARIES>")
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/BlueGeneP-base.cmake | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
