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 683c3392018c380c93427a68d5e6b50b2fb98707 (commit)
via 853a479f4ba5c918661345f94edac2e24bc4d3be (commit)
from 753fce7909711082ace4cc2054c9a3dcb2ee4510 (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=683c3392018c380c93427a68d5e6b50b2fb98707
commit 683c3392018c380c93427a68d5e6b50b2fb98707
Merge: 753fce7 853a479
Author: Stephen Kelly <[email protected]>
AuthorDate: Sun Nov 17 09:46:21 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Sun Nov 17 09:46:21 2013 -0500
Merge topic 'cross-compiling-toolchain-variables' into next
853a479 Fix boog.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=853a479f4ba5c918661345f94edac2e24bc4d3be
commit 853a479f4ba5c918661345f94edac2e24bc4d3be
Author: Stephen Kelly <[email protected]>
AuthorDate: Sun Nov 17 15:45:50 2013 +0100
Commit: Stephen Kelly <[email protected]>
CommitDate: Sun Nov 17 15:45:50 2013 +0100
Fix boog.
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 7f5e57d..894e75d 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1903,7 +1903,7 @@ void
cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
{
std::string rootPath = this->Makefile->GetSafeDefinition("CMAKE_SYSROOT");
const char *stagePath
- = this->Makefile->GetSafeDefinition("CMAKE_STAGING_PREFIX");
+ = this->Makefile->GetDefinition("CMAKE_STAGING_PREFIX");
const char *installPrefix
= this->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
cmSystemTools::ConvertToUnixSlashes(rootPath);
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkInformation.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
