[Cmake-commits] CMake branch, next, updated. v2.8.11-1967-g1abd128

[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  1abd128d3646c4db45e9a4223f4bf39614461ae0 (commit)
       via  26862f6d4bc2c93e3e1db5c7ba96f9ffb991091f (commit)
      from  304fa02293829f9ea6cb4e4fab93420464d73b6b (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=1abd128d3646c4db45e9a4223f4bf39614461ae0
commit 1abd128d3646c4db45e9a4223f4bf39614461ae0
Merge: 304fa02 26862f6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 13:24:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 13:24:22 2013 -0400

    Merge topic 'cmake-help-generators-fix' into next
    
    26862f6 cmake -G is not only for makefile generators.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26862f6d4bc2c93e3e1db5c7ba96f9ffb991091f
commit 26862f6d4bc2c93e3e1db5c7ba96f9ffb991091f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 15 15:07:16 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 16 19:23:52 2013 +0200

    cmake -G is not only for makefile generators.

diff --git a/Source/cmake.h b/Source/cmake.h
index 63065a1..1a4ec62 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -532,9 +532,9 @@ private:
    "CMakeCache.txt file, globbing expressions using * and ? are supported. "\
    "The option may be repeated for as many cache entries as desired.\n" \
    "Use with care, you can make your CMakeCache.txt non-working."}, \
-  {"-G <generator-name>", "Specify a makefile generator.", \
+  {"-G <generator-name>", "Specify a build system generator.", \
    "CMake may support multiple native build systems on certain platforms.  " \
-   "A makefile generator is responsible for generating a particular build " \
+   "A generator is responsible for generating a particular build " \
    "system.  Possible generator names are specified in the Generators " \
    "section."},\
   {"-T <toolset-name>", "Specify toolset name if supported by generator.", \

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

Summary of changes:
 Source/cmake.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake