[Cmake-commits] CMake branch, next, updated. v3.2.1-1728-gfb490a0

[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  fb490a0931b759dac420a178747f93e0c56b35c5 (commit)
       via  68a8dff804d3e1e4b4b47d850a1cca5a13393c70 (commit)
      from  f9b2ab214fb8041b3c8741e72f73a7bc360d3727 (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=fb490a0931b759dac420a178747f93e0c56b35c5
commit fb490a0931b759dac420a178747f93e0c56b35c5
Merge: f9b2ab2 68a8dff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 15:14:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 10 15:14:28 2015 -0400

    Merge topic 'cmake-G-print-generators' into next
    
    68a8dff8 fixup! cmake: Provide guidance when an invalid -G option is given


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68a8dff804d3e1e4b4b47d850a1cca5a13393c70
commit 68a8dff804d3e1e4b4b47d850a1cca5a13393c70
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 15:14:09 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 10 15:14:09 2015 -0400

    fixup! cmake: Provide guidance when an invalid -G option is given

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 6d75e29..3654aa7 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1965,12 +1965,14 @@ void cmake::GetGeneratorDocumentation(std::vector<cmDocumentationEntry>& v)
 
 void cmake::PrintGeneratorList()
 {
+#ifdef CMAKE_BUILD_WITH_CMAKE
   cmDocumentation doc;
   std::vector<cmDocumentationEntry> generators;
   this->GetGeneratorDocumentation(generators);
   doc.AppendSection("Generators",generators);
   std::cerr << "\n";
   doc.PrintDocumentation(cmDocumentation::ListGenerators, std::cerr);
+#endif
 }
 
 void cmake::UpdateConversionPathTable()

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

Summary of changes:
 Source/cmake.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake