[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7164-gb61fff9

[Alexander Neundorf]

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  b61fff94ef1d137390129a50862353d6271198de (commit)
       via  e02cdba0549f64ee86ba5b059135d52b74c1f70f (commit)
      from  28e1e8e8a8ef194ef127e30e6b3d98de3d37fede (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=b61fff94ef1d137390129a50862353d6271198de
commit b61fff94ef1d137390129a50862353d6271198de
Merge: 28e1e8e e02cdba
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Jan 17 08:53:13 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 17 08:53:13 2014 -0500

    Merge topic 'KateDontRequireVariable' into next
    
    e02cdba0 Kate: use cmMakefile::GetSafeDefinition() for a not-required variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e02cdba0549f64ee86ba5b059135d52b74c1f70f
commit e02cdba0549f64ee86ba5b059135d52b74c1f70f
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Jan 17 14:04:33 2014 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Jan 17 14:04:33 2014 +0100

    Kate: use cmMakefile::GetSafeDefinition() for a not-required variable
    
    ...otherwise the generator failed in embedded projects via
    externalproject(), since there CMAKE_KATE_MAKE_ARGUMENT is not set.
    Using GetSafeDefinition() is good enough to protect against
    NULL-pointers.
    
    Alex

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 0312488..d0f83b2 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -70,7 +70,7 @@ void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
     }
 
   std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
-  std::string args = mf->GetRequiredDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
+  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
 
   fout <<
     "{\n"

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

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


hooks/post-receive
-- 
CMake