[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3504-gd280af5

[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  d280af5eb7e1491ab0afcf374136cb80eb4cd1c5 (commit)
       via  c1d30ed63e622072cfc4301318d235cc2dc18b37 (commit)
      from  7f4ff4f1dcae318d4629d1e46e17f84f2b4f644d (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=d280af5eb7e1491ab0afcf374136cb80eb4cd1c5
commit d280af5eb7e1491ab0afcf374136cb80eb4cd1c5
Merge: 7f4ff4f c1d30ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 3 11:36:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 3 11:36:52 2014 -0400

    Merge topic 'fix-build-crash-on-bad-generator' into next
    
    c1d30ed6 cmake: Fix --build crash on bad CMAKE_GENERATOR in cache


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1d30ed63e622072cfc4301318d235cc2dc18b37
commit c1d30ed63e622072cfc4301318d235cc2dc18b37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 3 11:36:25 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 3 11:37:27 2014 -0400

    cmake: Fix --build crash on bad CMAKE_GENERATOR in cache
    
    If we fail to create the generator named by CMAKE_GENERATOR, exit
    with an error message instead of crashing.  While at it, fix the
    wording of the error message when CMAKE_GENERATOR is not set.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index abbabe7..7297173 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2664,11 +2664,17 @@ int cmake::Build(const std::string& dir,
     }
   if(!it.Find("CMAKE_GENERATOR"))
     {
-    std::cerr << "Error: could find generator in Cache\n";
+    std::cerr << "Error: could not find CMAKE_GENERATOR in Cache\n";
     return 1;
     }
   cmsys::auto_ptr<cmGlobalGenerator> gen(
     this->CreateGlobalGenerator(it.GetValue()));
+  if(!gen.get())
+    {
+    std::cerr << "Error: could create CMAKE_GENERATOR \""
+              << it.GetValue() << "\"\n";
+    return 1;
+    }
   std::string output;
   std::string projName;
   if(!it.Find("CMAKE_PROJECT_NAME"))

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

Summary of changes:
 Source/cmake.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake