[Cmake-commits] CMake branch, next, updated. v3.2.1-1364-gae11f76

[Stephen Kelly]

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  ae11f760358c8bd05f95eb81118bd08bd88aa416 (commit)
       via  4f663fbb8dd72855e36b697d16cd609be656b993 (commit)
      from  6e16fb8832cc6fffaf0661e5f120b4b4f6f09bf9 (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=ae11f760358c8bd05f95eb81118bd08bd88aa416
commit ae11f760358c8bd05f95eb81118bd08bd88aa416
Merge: 6e16fb8 4f663fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 15:04:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 1 15:04:28 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    4f663fbb fixup! cmMakefile: Remove ProjectName member.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f663fbb8dd72855e36b697d16cd609be656b993
commit 4f663fbb8dd72855e36b697d16cd609be656b993
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 1 21:03:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 1 21:03:56 2015 +0200

    fixup! cmMakefile: Remove ProjectName member.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f4c319c..ff53987 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -338,7 +338,8 @@ public:
    */
   const char* GetProjectName() const
     {
-      return this->GetDefinition("PROJECT_NAME");
+      const char* def = this->GetDefinition("PROJECT_NAME");
+      return def ? def : "";
     }
 
   /** Get the configurations to be generated.  */

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

Summary of changes:
 Source/cmMakefile.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake