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 828f247c9bb36f6e378c773497b6ce0b333839b5 (commit)
via 3e3ebeab9cc64e236d0c1c6d1de19869291fbcb2 (commit)
from 98220cb3c9dc8a01db12ecfb224ffbd45052fc7b (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=828f247c9bb36f6e378c773497b6ce0b333839b5
commit 828f247c9bb36f6e378c773497b6ce0b333839b5
Merge: 98220cb 3e3ebea
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Sep 19 16:05:19 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 19 16:05:19 2016 -0400
Merge topic 'cleanup-Convert' into next
3e3ebeab Convert: Simplify switch
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e3ebeab9cc64e236d0c1c6d1de19869291fbcb2
commit 3e3ebeab9cc64e236d0c1c6d1de19869291fbcb2
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sat Aug 27 13:48:57 2016 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Sep 19 22:04:48 2016 +0200
Convert: Simplify switch
Make it more clear what is happening here.
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index cc3ee93f..4f12ae0 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -53,15 +53,14 @@ std::string cmOutputConverter::ConvertToRelativePath(
switch (relative) {
case HOME_OUTPUT:
- result = this->ConvertToRelativePath(
- this->GetState()->GetBinaryDirectory(), source);
+ result = this->GetState()->GetBinaryDirectory();
break;
case START_OUTPUT:
- result = this->ConvertToRelativePath(
- this->StateSnapshot.GetDirectory().GetCurrentBinary(), source);
+ result = this->StateSnapshot.GetDirectory().GetCurrentBinary();
break;
}
- return result;
+
+ return this->ConvertToRelativePath(result, source);
}
std::string cmOutputConverter::Convert(const std::string& source,
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
