[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1138-g13d959a

[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  13d959a7f0fea7a504dbedf7a759bacb84e58b1d (commit)
       via  c6055d9d4c2f37822866981f5cea1f7389431d49 (commit)
       via  cbe3ee58ca568ede66ff04abb6b73ac39b092701 (commit)
      from  55357db2cb883589969959fadc5dc66be3c383de (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=13d959a7f0fea7a504dbedf7a759bacb84e58b1d
commit 13d959a7f0fea7a504dbedf7a759bacb84e58b1d
Merge: 55357db c6055d9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 13:02:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 18 13:02:59 2015 -0400

    Merge topic 'remove-Properties-accessor' into next
    
    c6055d9d cmMakefile: Remove GetProperties method.
    cbe3ee58 cmMakefile: Add a PropertyKeys accessor.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6055d9d4c2f37822866981f5cea1f7389431d49
commit c6055d9d4c2f37822866981f5cea1f7389431d49
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 18:59:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 18:59:41 2015 +0200

    cmMakefile: Remove GetProperties method.
    
    The storage details of properties do not belong in the API.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index a010da1..1e2615d 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -702,9 +702,6 @@ public:
   bool GetPropertyAsBool(const std::string& prop) const;
   std::vector<std::string> GetPropertyKeys() const;
 
-  // Get the properties
-  cmPropertyMap &GetProperties() { return this->Properties; }
-
   ///! Initialize a makefile from its parent
   void InitializeFromParent(cmMakefile* parent);
 

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

    cmMakefile: Add a PropertyKeys accessor.

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 1674e98..f8d882c 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -814,14 +814,15 @@ void cmGlobalVisualStudio7Generator
 {
   bool extensibilityGlobalsOverridden = false;
   bool extensibilityAddInsOverridden = false;
-  const cmPropertyMap& props = root->GetMakefile()->GetProperties();
-  for(cmPropertyMap::const_iterator itProp = props.begin();
-      itProp != props.end(); ++itProp)
+  const std::vector<std::string> propKeys =
+      root->GetMakefile()->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator it = propKeys.begin();
+      it != propKeys.end(); ++it)
     {
-    if(itProp->first.find("VS_GLOBAL_SECTION_") == 0)
+    if(it->find("VS_GLOBAL_SECTION_") == 0)
       {
       std::string sectionType;
-      std::string name = itProp->first.substr(18);
+      std::string name = it->substr(18);
       if(name.find("PRE_") == 0)
         {
         name = name.substr(4);
@@ -842,8 +843,9 @@ void cmGlobalVisualStudio7Generator
           extensibilityAddInsOverridden = true;
         fout << "\tGlobalSection(" << name << ") = " << sectionType << "\n";
         std::vector<std::string> keyValuePairs;
-        cmSystemTools::ExpandListArgument(itProp->second.GetValue(),
-                                          keyValuePairs);
+        cmSystemTools::ExpandListArgument(
+              root->GetMakefile()->GetProperty(it->c_str()),
+              keyValuePairs);
         for(std::vector<std::string>::const_iterator itPair =
             keyValuePairs.begin(); itPair != keyValuePairs.end(); ++itPair)
           {
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 94c77e1..609e2d8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4367,6 +4367,18 @@ bool cmMakefile::GetPropertyAsBool(const std::string& prop) const
   return cmSystemTools::IsOn(this->GetProperty(prop));
 }
 
+std::vector<std::string> cmMakefile::GetPropertyKeys() const
+{
+  std::vector<std::string> keys;
+  keys.reserve(this->Properties.size());
+  for(cmPropertyMap::const_iterator it = this->Properties.begin();
+      it != this->Properties.end(); ++it)
+    {
+    keys.push_back(it->first);
+    }
+  return keys;
+}
+
 cmTarget* cmMakefile::FindTarget(const std::string& name,
                                  bool excludeAliases) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 82a2279..a010da1 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -700,6 +700,7 @@ public:
   const char *GetProperty(const std::string& prop) const;
   const char *GetProperty(const std::string& prop, bool chain) const;
   bool GetPropertyAsBool(const std::string& prop) const;
+  std::vector<std::string> GetPropertyKeys() const;
 
   // Get the properties
   cmPropertyMap &GetProperties() { return this->Properties; }

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

Summary of changes:
 Source/cmGlobalVisualStudio7Generator.cxx |   16 +++++++++-------
 Source/cmMakefile.cxx                     |   12 ++++++++++++
 Source/cmMakefile.h                       |    4 +---
 3 files changed, 22 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake