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 71dc29aa75161ee690701ab70aaa39bd29215ad1 (commit)
via a20820fbfe862abd11fcec6fa293ddca94dfdb40 (commit)
from 6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae (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=71dc29aa75161ee690701ab70aaa39bd29215ad1
commit 71dc29aa75161ee690701ab70aaa39bd29215ad1
Merge: 6110d7b a20820f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Mar 11 03:48:54 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 11 03:48:54 2014 -0400
Merge topic 'remove-c_str-calls' into next
a20820fb Fix line length.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a20820fbfe862abd11fcec6fa293ddca94dfdb40
commit a20820fbfe862abd11fcec6fa293ddca94dfdb40
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Mar 11 08:47:40 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Mar 11 08:47:40 2014 +0100
Fix line length.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index c337e10..14b2a1a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -393,7 +393,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
const std::string &lang) const
{
const char *compilerId = context->Makefile ?
- context->Makefile->GetSafeDefinition("CMAKE_" +
lang + "_COMPILER_ID") : "";
+ context->Makefile->GetSafeDefinition(
+ "CMAKE_" + lang + "_COMPILER_ID") : "";
if (parameters.size() == 0)
{
return compilerId ? compilerId : "";
@@ -499,7 +500,8 @@ struct CompilerVersionNode : public
cmGeneratorExpressionNode
const std::string &lang) const
{
const char *compilerVersion = context->Makefile ?
- context->Makefile->GetSafeDefinition("CMAKE_" +
lang + "_COMPILER_VERSION") : "";
+ context->Makefile->GetSafeDefinition(
+ "CMAKE_" + lang + "_COMPILER_VERSION") : "";
if (parameters.size() == 0)
{
return compilerVersion ? compilerVersion : "";
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
