[Cmake-commits] CMake branch, next, updated. v3.2.2-1946-g6f1bb33

[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  6f1bb33e01a036534582b6923bfff60883f6359d (commit)
       via  0cd8194f0d06a44318dd37c9d5867c6d252dcf5c (commit)
      from  7a57762cbb03b41a7f9eaf3215a39e36c19c65c9 (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=6f1bb33e01a036534582b6923bfff60883f6359d
commit 6f1bb33e01a036534582b6923bfff60883f6359d
Merge: 7a57762 0cd8194
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 13:54:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 13:54:47 2015 -0400

    Merge topic 'add-GreenHills-MULTI-generator' into next
    
    0cd8194f GHS: Document generator as work-in-progress


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cd8194f0d06a44318dd37c9d5867c6d252dcf5c
commit 0cd8194f0d06a44318dd37c9d5867c6d252dcf5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 13:50:38 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 20 13:50:38 2015 -0400

    GHS: Document generator as work-in-progress

diff --git a/Help/generator/Green Hills MULTI.rst b/Help/generator/Green Hills MULTI.rst
index d317f87..4d31690 100644
--- a/Help/generator/Green Hills MULTI.rst	
+++ b/Help/generator/Green Hills MULTI.rst	
@@ -1,7 +1,7 @@
 Green Hills MULTI
 -----------------
 
-Generates Green Hills MULTI project files.
+Generates Green Hills MULTI project files (experimental, work-in-progress).
 
 Customizations are available through the following cache variables:
 
@@ -11,6 +11,6 @@ Customizations are available through the following cache variables:
 * ``GHS_OS_DIR``
 
 .. note::
-  This generator is deemed experimental as of CMake |release|.
-  Future versions of CMake may make breaking changes as the
-  generator matures.
+  This generator is deemed experimental as of CMake |release|
+  and is still a work in progress.  Future versions of CMake
+  may make breaking changes as the generator matures.
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index d522c60..bba29b1 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -43,7 +43,8 @@ cmLocalGenerator *cmGlobalGhsMultiGenerator::CreateLocalGenerator()
 void cmGlobalGhsMultiGenerator::GetDocumentation(cmDocumentationEntry &entry)
 {
   entry.Name = GetActualName();
-  entry.Brief = "Generates Green Hills MULTI files (experimental).";
+  entry.Brief =
+    "Generates Green Hills MULTI files (experimental, work-in-progress).";
 }
 
 void cmGlobalGhsMultiGenerator::EnableLanguage(

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

Summary of changes:
 Help/generator/Green Hills MULTI.rst |    8 ++++----
 Source/cmGlobalGhsMultiGenerator.cxx |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake