[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-215-g54391ec

[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  54391ec936461f964127223c2832fa7a4f297f14 (commit)
       via  d4a14a7820e7a3a2a5648f52ae7b027d1b5ed6f5 (commit)
      from  1070aa3f78dd5d8b78080cc3921a8d786799493a (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=54391ec936461f964127223c2832fa7a4f297f14
commit 54391ec936461f964127223c2832fa7a4f297f14
Merge: 1070aa3 d4a14a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 09:21:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 7 09:21:48 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    d4a14a78 fixup! cmMakefile: Simplify handling of CACHE_VARIABLES property.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4a14a7820e7a3a2a5648f52ae7b027d1b5ed6f5
commit d4a14a7820e7a3a2a5648f52ae7b027d1b5ed6f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 15:21:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 7 15:21:25 2015 +0200

    fixup! cmMakefile: Simplify handling of CACHE_VARIABLES property.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b00f293..2a3c51b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4158,11 +4158,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     }
   else if ( prop == "CACHE_VARIABLES" )
     {
-    std::vector<std::string> result = this->Internal->ClosureKeys();
-    std::vector<std::string> cacheKeys = this->GetState()->GetCacheEntryKeys();
-    result.insert(result.end(), cacheKeys.begin(), cacheKeys.end());
-    std::sort(result.begin(), result.end());
-    output = cmJoin(result, ";");
+    output = cmJoin(this->GetState()->GetCacheEntryKeys(), ";");
     return output.c_str();
     }
   else if (prop == "VARIABLES")

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

Summary of changes:
 Source/cmMakefile.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)


hooks/post-receive
-- 
CMake