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 8b953130b0c41258944c9de32f2324dbf8285c30 (commit)
via f9d17fe94ccbfbee0c0de0ad405696d1051335be (commit)
from 4b6cbb7dfb21f2cb684796a9711d8c8edf312c19 (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=8b953130b0c41258944c9de32f2324dbf8285c30
commit 8b953130b0c41258944c9de32f2324dbf8285c30
Merge: 4b6cbb7 f9d17fe
Author: Brad King <[email protected]>
AuthorDate: Wed Jun 3 11:47:58 2015 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Jun 3 11:47:58 2015 -0400
Merge topic 'cmMakefile-Configure' into next
f9d17fe9 fixup! cmLocalGenerator: Remove 'optional' parameter from Convert.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9d17fe94ccbfbee0c0de0ad405696d1051335be
commit f9d17fe94ccbfbee0c0de0ad405696d1051335be
Author: Brad King <[email protected]>
AuthorDate: Wed Jun 3 11:41:04 2015 -0400
Commit: Brad King <[email protected]>
CommitDate: Wed Jun 3 11:46:12 2015 -0400
fixup! cmLocalGenerator: Remove 'optional' parameter from Convert.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9e6d9d8..6048dd3 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1124,9 +1124,8 @@ cmLocalGenerator::ConvertToOutputForExisting(const
std::string& remote,
RelativeRoot local,
OutputFormat format)
{
- (void)local;
// Perform standard conversion.
- std::string result = this->Convert(remote, local, format);
+ std::string result = this->ConvertToOutputFormat(remote, format);
// Consider short-path.
return this->ConvertToOutputForExistingCommon(remote, result, format);
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
