[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-213-g1070aa3

[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  1070aa3f78dd5d8b78080cc3921a8d786799493a (commit)
       via  d0681b13d8785d1aed8b520d6be11e8f83dbb5e5 (commit)
       via  aaf9b53f2ec25dbad9df7a457c46694de3c10d83 (commit)
       via  cf7c5a0c7b11b6622c1e475be267a550cacca78c (commit)
      from  2020cee1a8030aa2cc762216fc41f79a58e9ed20 (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=1070aa3f78dd5d8b78080cc3921a8d786799493a
commit 1070aa3f78dd5d8b78080cc3921a8d786799493a
Merge: 2020cee d0681b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 09:19:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 7 09:19:06 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    d0681b13 cmMakefile: Remove cacheOnly option from GetDefinitions.
    aaf9b53f cmGetCMakePropertyCommand: Don't explicitly specify default param.
    cf7c5a0c cmMakefile: Simplify handling of CACHE_VARIABLES property.


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

    cmMakefile: Remove cacheOnly option from GetDefinitions.
    
    It is now unused.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 08f8da7..b00f293 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2497,18 +2497,11 @@ const char* cmMakefile::GetSafeDefinition(const std::string& def) const
   return ret;
 }
 
-std::vector<std::string> cmMakefile
-::GetDefinitions(int cacheonly /* = 0 */) const
+std::vector<std::string> cmMakefile::GetDefinitions() const
 {
-  std::vector<std::string> res;
-  if ( !cacheonly )
-    {
-    res = this->Internal->ClosureKeys();
-    }
-  std::vector<std::string> cacheKeys =
-      this->GetState()->GetCacheEntryKeys();
+  std::vector<std::string> res = this->Internal->ClosureKeys();
+  std::vector<std::string> cacheKeys = this->GetState()->GetCacheEntryKeys();
   res.insert(res.end(), cacheKeys.begin(), cacheKeys.end());
-
   std::sort(res.begin(), res.end());
   return res;
 }
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index def0c23..ca7d4b0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -511,7 +511,7 @@ public:
    * cacheonly is specified and is greater than 0, then only cache
    * variables will be listed.
    */
-  std::vector<std::string> GetDefinitions(int cacheonly=0) const;
+  std::vector<std::string> GetDefinitions() const;
 
   /**
    * Test a boolean variable to see if it is true or false.

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

    cmGetCMakePropertyCommand: Don't explicitly specify default param.

diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 76803c1..61cf85b 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -32,8 +32,7 @@ bool cmGetCMakePropertyCommand
 
   if ( args[1] == "VARIABLES" )
     {
-    int cacheonly = 0;
-    std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly);
+    std::vector<std::string> vars = this->Makefile->GetDefinitions();
     if (!vars.empty())
       {
       output = cmJoin(vars, ";");

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

    cmMakefile: Simplify handling of CACHE_VARIABLES property.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3ac77e9..08f8da7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4163,14 +4163,18 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     output = cmJoin(this->ListFileStack, ";");
     return output.c_str();
     }
-  else if (prop == "VARIABLES" || prop == "CACHE_VARIABLES")
+  else if ( prop == "CACHE_VARIABLES" )
     {
-    int cacheonly = 0;
-    if ( prop == "CACHE_VARIABLES" )
-      {
-      cacheonly = 1;
-      }
-    output = cmJoin(this->GetDefinitions(cacheonly), ";");
+    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, ";");
+    return output.c_str();
+    }
+  else if (prop == "VARIABLES")
+    {
+    output = cmJoin(this->GetDefinitions(), ";");
     return output.c_str();
     }
   else if (prop == "MACROS")

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

Summary of changes:
 Source/cmGetCMakePropertyCommand.cxx |    3 +--
 Source/cmMakefile.cxx                |   31 ++++++++++++++-----------------
 Source/cmMakefile.h                  |    2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
CMake