[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2581-g54a26a0

[Stephen Kelly]

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  54a26a0f21248e752b5ab1dc6317546d18e47fae (commit)
       via  e3b7eac5933a7ca913ce4b0adaf8e5370b04c997 (commit)
       via  ad304a2f7d2861b8127502f056ae4d8d07774c07 (commit)
       via  08319e071e4b876a8f9c35edf8d73f3c145dff35 (commit)
      from  e073444545114bea24a0beded235b0a019ef1b84 (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=54a26a0f21248e752b5ab1dc6317546d18e47fae
commit 54a26a0f21248e752b5ab1dc6317546d18e47fae
Merge: e073444 e3b7eac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 11 04:55:21 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 11 04:55:21 2013 -0400

    Merge topic 'minor-cleanup' into next
    
    e3b7eac Style: Don't put an else after a return.
    ad304a2 cmSystemTools: Fix typo in comment.
    08319e0 Genex: Fix indentation in docs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3b7eac5933a7ca913ce4b0adaf8e5370b04c997
commit e3b7eac5933a7ca913ce4b0adaf8e5370b04c997
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 11 10:49:40 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 11 10:50:00 2013 +0200

    Style: Don't put an else after a return.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 28f749d..04ade4a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -266,8 +266,6 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
       {
       return compilerId ? compilerId : "";
       }
-    else
-    {
     cmsys::RegularExpression compilerIdValidator;
     compilerIdValidator.compile("^[A-Za-z0-9_]*$");
     if (!compilerIdValidator.find(parameters.begin()->c_str()))
@@ -286,7 +284,6 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
       return "1";
       }
     return "0";
-    }
   }
 };
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad304a2f7d2861b8127502f056ae4d8d07774c07
commit ad304a2f7d2861b8127502f056ae4d8d07774c07
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 11 09:52:30 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 11 09:52:30 2013 +0200

    cmSystemTools: Fix typo in comment.

diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index f5be26b..ec53929 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -274,7 +274,7 @@ public:
   static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; }
 
   /**
-   * Come constants for different file formats.
+   * Some constants for different file formats.
    */
   enum FileFormat {
     NO_FILE_FORMAT = 0,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08319e071e4b876a8f9c35edf8d73f3c145dff35
commit 08319e071e4b876a8f9c35edf8d73f3c145dff35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 11 09:52:08 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 11 09:52:08 2013 +0200

    Genex: Fix indentation in docs.

diff --git a/Source/cmDocumentGeneratorExpressions.h b/Source/cmDocumentGeneratorExpressions.h
index a8b3847..12ee9fa 100644
--- a/Source/cmDocumentGeneratorExpressions.h
+++ b/Source/cmDocumentGeneratorExpressions.h
@@ -44,9 +44,9 @@
   "used.\n"                                                             \
   "  $<C_COMPILER_ID:comp>     = '1' if the CMake-id of the C "         \
   "compiler matches comp, otherwise '0'.\n"                             \
-  "  $<CXX_COMPILER_ID>          = The CMake-id of the CXX compiler "   \
+  "  $<CXX_COMPILER_ID>        = The CMake-id of the CXX compiler "     \
   "used.\n"                                                             \
-  "  $<CXX_COMPILER_ID:comp>     = '1' if the CMake-id of the CXX "     \
+  "  $<CXX_COMPILER_ID:comp>   = '1' if the CMake-id of the CXX "       \
   "compiler matches comp, otherwise '0'.\n"                             \
   "  $<TARGET_FILE:tgt>        = main file (.exe, .so.1.2, .a)\n"       \
   "  $<TARGET_LINKER_FILE:tgt> = file used to link (.a, .lib, .so)\n"   \

-----------------------------------------------------------------------

Summary of changes:
 Source/cmDocumentGeneratorExpressions.h   |    4 ++--
 Source/cmGeneratorExpressionEvaluator.cxx |    3 ---
 Source/cmSystemTools.h                    |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake