[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1169-gd5f65f1

[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  d5f65f1307f3d4e67d31f333cf34a97588cfe033 (commit)
       via  41bb831fc910d85d79811dc367b25c0880cbe6ac (commit)
      from  209bd4163bcaa2709fe7d5127f8060bcd95f734e (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=d5f65f1307f3d4e67d31f333cf34a97588cfe033
commit d5f65f1307f3d4e67d31f333cf34a97588cfe033
Merge: 209bd41 41bb831
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 19 10:01:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 19 10:01:50 2015 -0400

    Merge topic 'remove-special-MACROS-handling' into next
    
    41bb831f cmMakefile: Remove special handling of MACROS property.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41bb831fc910d85d79811dc367b25c0880cbe6ac
commit 41bb831fc910d85d79811dc367b25c0880cbe6ac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 14:32:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jul 19 16:01:39 2015 +0200

    cmMakefile: Remove special handling of MACROS property.

diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index a460ca6..99e2867 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -41,7 +41,10 @@ bool cmGetCMakePropertyCommand
   else if ( args[1] == "MACROS" )
     {
     output.clear();
-    this->Makefile->GetListOfMacros(output);
+    if (const char* macrosProp = this->Makefile->GetProperty("MACROS"))
+      {
+      output = macrosProp;
+      }
     }
   else if ( args[1] == "COMPONENTS" )
     {
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 6d3054a..fa5a623 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -211,7 +211,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
     // if this is the endmacro for this macro then execute
     if (!this->Depth)
       {
-      mf.AddMacro(this->Args[0].c_str());
+      mf.AppendProperty("MACROS", this->Args[0].c_str());
       // create a new command and add it to cmake
       cmMacroHelperCommand *f = new cmMacroHelperCommand();
       f->Args = this->Args;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3c8a41d2..14ef934 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3817,18 +3817,6 @@ cmVariableWatch *cmMakefile::GetVariableWatch() const
 }
 #endif
 
-void cmMakefile::AddMacro(const char* name)
-{
-  assert(name);
-  this->MacrosList.push_back(name);
-}
-
-void cmMakefile::GetListOfMacros(std::string& macros) const
-{
-  assert(macros.empty());
-  macros = cmJoin(this->MacrosList, ";");
-}
-
 cmState *cmMakefile::GetState() const
 {
   return this->GetCMakeInstance()->GetState();
@@ -4265,11 +4253,6 @@ const char *cmMakefile::GetProperty(const std::string& prop,
     output = cmJoin(this->GetDefinitions(), ";");
     return output.c_str();
     }
-  else if (prop == "MACROS")
-    {
-    this->GetListOfMacros(output);
-    return output.c_str();
-    }
   else if (prop == "INCLUDE_DIRECTORIES")
     {
     std::string sep;
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 98d199a..489a8b1 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -655,12 +655,6 @@ public:
    */
   cmSourceFile *GetSourceFileWithOutput(const std::string& outName) const;
 
-  /**
-   * Add a macro to the list of macros. The arguments should be name of the
-   * macro and a documentation signature of it
-   */
-  void AddMacro(const char* name);
-
   ///! Add a new cmTest to the list of tests for this makefile.
   cmTest* CreateTest(const std::string& testName);
 
@@ -670,11 +664,6 @@ public:
   cmTest* GetTest(const std::string& testName) const;
 
   /**
-   * Get a list of macros as a ; separated string
-   */
-  void GetListOfMacros(std::string& macros) const;
-
-  /**
    * Return a location of a file in cmake or custom modules directory
    */
   std::string GetModulesFile(const char* name) const;
@@ -909,8 +898,6 @@ private:
 
   std::stack<int> LoopBlockCounter;
 
-  std::vector<std::string> MacrosList;
-
   mutable cmsys::RegularExpression cmDefineRegex;
   mutable cmsys::RegularExpression cmDefine01Regex;
   mutable cmsys::RegularExpression cmAtVarRegex;

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

Summary of changes:


hooks/post-receive
-- 
CMake