[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-283-g7eb3cd5
Stephen Kelly
steveire at gmail.com
Fri Oct 9 14:32:20 EDT 2015
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 7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef (commit)
via 38d18c054f21306bd8af249d350d692ab4630c3c (commit)
from 4dcd97c26c639e3fb73faf60664f00df493ff85a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef
commit 7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef
Merge: 4dcd97c 38d18c0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 14:32:19 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 9 14:32:19 2015 -0400
Merge topic 'use-generator-target' into next
38d18c05 fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38d18c054f21306bd8af249d350d692ab4630c3c
commit 38d18c054f21306bd8af249d350d692ab4630c3c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 20:29:56 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 20:29:56 2015 +0200
fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c4a083d..8ff78e0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1428,7 +1428,8 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
w << " less than 10.5 or because CMake's platform configuration is";
w << " corrupt.";
cmake* cm = this->Makefile->GetCMakeInstance();
- cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->Target->GetBacktrace());
+ cm->IssueMessage(cmake::FATAL_ERROR, w.str(),
+ this->Target->GetBacktrace());
}
return true;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list