[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-600-g4553da6

[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  4553da69ac86c7b3cfaccdeee93fee38a2a7c28b (commit)
       via  0a73a44eda60da19924bd9559de6acf3cc3f4515 (commit)
      from  a1f71397fb5c61bf66594100e5166cc8aa12c722 (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=4553da69ac86c7b3cfaccdeee93fee38a2a7c28b
commit 4553da69ac86c7b3cfaccdeee93fee38a2a7c28b
Merge: a1f7139 0a73a44
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 7 09:08:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 7 09:08:16 2014 -0500

    Merge topic 'dev/string-apis' into next
    
    0a73a44e stringapi: Fix NULL config name in cmGlobalNinjaGenerator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a73a44eda60da19924bd9559de6acf3cc3f4515
commit 0a73a44eda60da19924bd9559de6acf3cc3f4515
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 7 09:06:36 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 7 09:06:36 2014 -0500

    stringapi: Fix NULL config name in cmGlobalNinjaGenerator

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6c42320..785b902 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -834,8 +834,8 @@ void
 cmGlobalNinjaGenerator
 ::AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs)
 {
-  const char* configName =
-    target->GetMakefile()->GetDefinition("CMAKE_BUILD_TYPE");
+  std::string configName =
+    target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   cmLocalNinjaGenerator *ng =
     static_cast<cmLocalNinjaGenerator *>(this->LocalGenerators[0]);
 

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake