[Cmake-commits] CMake branch, next, updated. v2.8.4-1519-g4e2c10a
Brad King
brad.king at kitware.com
Wed May 11 09:31:05 EDT 2011
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 4e2c10a4995c91c5b85c7adfd9d642a80d0f3a68 (commit)
via 834b77a43bfa7989c4c0e670d0effaf39c1dcb24 (commit)
via 97cc8d50d550bf358dbf36a063f5f79673e1bf3e (commit)
from 3ceeb06b218696827ab919933616c79fd76ac2e9 (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=4e2c10a4995c91c5b85c7adfd9d642a80d0f3a68
commit 4e2c10a4995c91c5b85c7adfd9d642a80d0f3a68
Merge: 3ceeb06 834b77a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 11 09:31:03 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 11 09:31:03 2011 -0400
Merge topic 'irix-install-RPATH-issue-12173' into next
834b77a Revert "IRIX: Edit RPATH during install instead of relinking (#12173)"
97cc8d5 Revert "IRIX: Work around trailing separator removal in RPATH (#12173)"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=834b77a43bfa7989c4c0e670d0effaf39c1dcb24
commit 834b77a43bfa7989c4c0e670d0effaf39c1dcb24
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 11 09:28:25 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed May 11 09:28:25 2011 -0400
Revert "IRIX: Edit RPATH during install instead of relinking (#12173)"
This reverts commit 2f97fcc84b0048c83be3e2706046a9ed68435614.
The RPATH editing does not work well because it currently edits at most
the portion added by the rpath computed for the current binary. The
binary may still contain paths taken from transitive dependencies so
paths from the original build tree may still be left.
diff --git a/Modules/Platform/IRIX.cmake b/Modules/Platform/IRIX.cmake
index 9bf159a..fac941f 100644
--- a/Modules/Platform/IRIX.cmake
+++ b/Modules/Platform/IRIX.cmake
@@ -1,7 +1,7 @@
SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "") # : or empty
IF(NOT CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
"<CMAKE_CXX_COMPILER> -ar -o <TARGET> <OBJECTS>")
diff --git a/Modules/Platform/IRIX64.cmake b/Modules/Platform/IRIX64.cmake
index c13cf4e..b60a7f2 100644
--- a/Modules/Platform/IRIX64.cmake
+++ b/Modules/Platform/IRIX64.cmake
@@ -1,7 +1,7 @@
SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
-SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "") # : or empty
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
IF(NOT CMAKE_COMPILER_IS_GNUCC)
# Set default flags init.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97cc8d50d550bf358dbf36a063f5f79673e1bf3e
commit 97cc8d50d550bf358dbf36a063f5f79673e1bf3e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 11 09:28:17 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed May 11 09:28:17 2011 -0400
Revert "IRIX: Work around trailing separator removal in RPATH (#12173)"
This reverts commit 8fc3baba7c11c83d9b12fdeb724570df830a1de3.
diff --git a/Modules/Platform/IRIX.cmake b/Modules/Platform/IRIX.cmake
index bbed246..9bf159a 100644
--- a/Modules/Platform/IRIX.cmake
+++ b/Modules/Platform/IRIX.cmake
@@ -2,7 +2,6 @@ SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
-SET(CMAKE_PLATFORM_RPATH_PLACEHOLDER_END "/")
IF(NOT CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
"<CMAKE_CXX_COMPILER> -ar -o <TARGET> <OBJECTS>")
diff --git a/Modules/Platform/IRIX64.cmake b/Modules/Platform/IRIX64.cmake
index c254c94..c13cf4e 100644
--- a/Modules/Platform/IRIX64.cmake
+++ b/Modules/Platform/IRIX64.cmake
@@ -2,7 +2,6 @@ SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
-SET(CMAKE_PLATFORM_RPATH_PLACEHOLDER_END "/")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
IF(NOT CMAKE_COMPILER_IS_GNUCC)
# Set default flags init.
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 25c6bfc..e3c33a2 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -307,9 +307,6 @@ cmComputeLinkInformation
std::string rtSepVar = rtVar + "_SEP";
this->RuntimeFlag = this->Makefile->GetSafeDefinition(rtVar.c_str());
this->RuntimeSep = this->Makefile->GetSafeDefinition(rtSepVar.c_str());
- this->RuntimeEnd =
- (this->Makefile->
- GetSafeDefinition("CMAKE_PLATFORM_RPATH_PLACEHOLDER_END"));
this->RuntimeAlways =
(this->Makefile->
GetSafeDefinition("CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH"));
@@ -1827,10 +1824,6 @@ std::string cmComputeLinkInformation::GetRPathString(bool for_install)
{
rpath += this->GetRuntimeSep();
}
-
- // Some linkers (e.g. SGI ld 7.44) remove one trailing separator
- // so we may add a bogus trailing path.
- rpath += this->RuntimeEnd;
}
return rpath;
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 5f9d6c2..bbeed68 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -100,7 +100,6 @@ private:
std::string LibLinkSuffix;
std::string RuntimeFlag;
std::string RuntimeSep;
- std::string RuntimeEnd;
std::string RuntimeAlways;
bool RuntimeUseChrpath;
bool NoSONameUsesPath;
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 8cd75cb..f2431e6 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1525,8 +1525,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_EXECUTABLE_RPATH_LINK_<LANG>_FLAG",
cmProperty::VARIABLE,0,0);
- cm->DefineProperty("CMAKE_PLATFORM_RPATH_PLACEHOLDER_END",
- cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH",
cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_SHARED_MODULE_CREATE_<LANG>_FLAGS",
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/IRIX.cmake | 3 +--
Modules/Platform/IRIX64.cmake | 3 +--
Source/cmComputeLinkInformation.cxx | 7 -------
Source/cmComputeLinkInformation.h | 1 -
Source/cmDocumentVariables.cxx | 2 --
5 files changed, 2 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list