[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-219-g2f67bcf

[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  2f67bcf5266384a557dceaa17161616a5d2044dd (commit)
       via  4c192fb53152a61015eb29c0a3826adeec16f8f8 (commit)
       via  046aafff12e6fa9834c7c114a59389df404ddf18 (commit)
       via  021c4b6f2bced25c9adbb472b94148987e1b6398 (commit)
      from  54391ec936461f964127223c2832fa7a4f297f14 (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=2f67bcf5266384a557dceaa17161616a5d2044dd
commit 2f67bcf5266384a557dceaa17161616a5d2044dd
Merge: 54391ec 4c192fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 09:22:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 7 09:22:07 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    4c192fb5 cmMakefile: Remove cacheOnly option from GetDefinitions.
    046aafff cmGetCMakePropertyCommand: Don't explicitly specify default param.
    021c4b6f cmMakefile: Simplify handling of CACHE_VARIABLES property.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c192fb53152a61015eb29c0a3826adeec16f8f8
commit 4c192fb53152a61015eb29c0a3826adeec16f8f8
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:21:56 2015 +0200

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

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b083f70..2a3c51b 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=046aafff12e6fa9834c7c114a59389df404ddf18
commit 046aafff12e6fa9834c7c114a59389df404ddf18
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:21:55 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=021c4b6f2bced25c9adbb472b94148987e1b6398
commit 021c4b6f2bced25c9adbb472b94148987e1b6398
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:21:55 2015 +0200

    cmMakefile: Simplify handling of CACHE_VARIABLES property.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3ac77e9..b083f70 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4163,14 +4163,14 @@ 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), ";");
+    output = cmJoin(this->GetState()->GetCacheEntryKeys(), ";");
+    return output.c_str();
+    }
+  else if (prop == "VARIABLES")
+    {
+    output = cmJoin(this->GetDefinitions(), ";");
     return output.c_str();
     }
   else if (prop == "MACROS")

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

Summary of changes:


hooks/post-receive
-- 
CMake