[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1130-gbd0ac69

[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  bd0ac691974bf42078b4cbdee1b06a21b25b222a (commit)
       via  2007d11caf6696f44d85bab165a665c5c4bf48f5 (commit)
       via  a622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8 (commit)
      from  257ba138b44872dbe305b3ef6d6d1685c00647fe (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=bd0ac691974bf42078b4cbdee1b06a21b25b222a
commit bd0ac691974bf42078b4cbdee1b06a21b25b222a
Merge: 257ba13 2007d11
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 08:40:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 18 08:40:52 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    2007d11c cmState: Remove unused variable.
    a622b829 cmGetCMakePropertyCommand: Clean up VARIABLES handling.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2007d11caf6696f44d85bab165a665c5c4bf48f5
commit 2007d11caf6696f44d85bab165a665c5c4bf48f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 14:25:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 14:40:12 2015 +0200

    cmState: Remove unused variable.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 2d8b935..bd37e61 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -470,8 +470,6 @@ void cmState::AppendGlobalProperty(const std::string& prop,
 
 const char *cmState::GetGlobalProperty(const std::string& prop)
 {
-  // watch for special properties
-  std::string output = "";
   if ( prop == "CACHE_VARIABLES" )
     {
     std::vector<std::string> cacheKeys = this->GetCacheEntryKeys();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8
commit a622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 14:35:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 14:39:51 2015 +0200

    cmGetCMakePropertyCommand: Clean up VARIABLES handling.

diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index a460ca6..5a1644c 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -32,10 +32,9 @@ bool cmGetCMakePropertyCommand
 
   if ( args[1] == "VARIABLES" )
     {
-    std::vector<std::string> vars = this->Makefile->GetDefinitions();
-    if (!vars.empty())
+    if (const char* varsProp = this->Makefile->GetProperty("VARIABLES"))
       {
-      output = cmJoin(vars, ";");
+      output = varsProp;
       }
     }
   else if ( args[1] == "MACROS" )

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

Summary of changes:
 Source/cmGetCMakePropertyCommand.cxx |    5 ++---
 Source/cmState.cxx                   |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake