[Cmake-commits] CMake branch, next, updated. v2.8.11-2093-gfc47828

[Brad King]

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  fc478283867d12697cfc2348eb161990ca7021ac (commit)
       via  dea4d263d3e23424185720745109bded4821d4af (commit)
      from  f0bf01b2a6b6eafb89ef93f6a6ecc5984fb743aa (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=fc478283867d12697cfc2348eb161990ca7021ac
commit fc478283867d12697cfc2348eb161990ca7021ac
Merge: f0bf01b dea4d26
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 21 14:45:49 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 21 14:45:49 2013 -0400

    Merge topic 'cmake-help-generators-fix' into next
    
    dea4d26 Docs: cmake -G selects a "build system" generator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dea4d263d3e23424185720745109bded4821d4af
commit dea4d263d3e23424185720745109bded4821d4af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 15 15:07:16 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 21 14:43:42 2013 -0400

    Docs: cmake -G selects a "build system" generator
    
    -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:


hooks/post-receive
-- 
CMake