[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-932-g2ba8a74

[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  2ba8a74b1dc3f8481f8b7b72afc12118f6ea35a6 (commit)
       via  ae32622bcfe4aee667b749f89e61d9a4fe44c762 (commit)
      from  5633458eaba33cda2ec25436bb408ad670d9e814 (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=2ba8a74b1dc3f8481f8b7b72afc12118f6ea35a6
commit 2ba8a74b1dc3f8481f8b7b72afc12118f6ea35a6
Merge: 5633458 ae32622
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 12 14:51:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 12 14:51:19 2014 -0400

    Merge topic 'string-apis-fix-cmake-gui' into next
    
    ae32622b cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae32622bcfe4aee667b749f89e61d9a4fe44c762
commit ae32622bcfe4aee667b749f89e61d9a4fe44c762
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 12 09:54:20 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 12 09:55:23 2014 -0400

    cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)
    
    Since commit 1a1b737c (stringapi: Use strings for generator names,
    2014-02-24) cmExternalMakefileProjectGenerator::CreateFullGeneratorName
    expects a std::string instead of const char*.  When no extra generator
    name is available, pass an empty string to avoid NULL dereference.

diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index 12da320..5f9ebaf 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -117,7 +117,7 @@ void QCMake::setBinaryDirectory(const QString& _dir)
       {
       const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR");
       std::string curGen = cmExternalMakefileProjectGenerator::
-                              CreateFullGeneratorName(itm.GetValue(), extraGen);
+        CreateFullGeneratorName(itm.GetValue(), extraGen? extraGen : "");
       this->setGenerator(QString::fromLocal8Bit(curGen.c_str()));
       }
     }

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

Summary of changes:
 Source/QtDialog/QCMake.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake