[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1132-gbd5323e

[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  bd5323ebea446fcf077f3db21452c6ec0d36f1e5 (commit)
       via  3f1d31429e5ba28be1cd550e05040865c1555b7a (commit)
      from  bd0ac691974bf42078b4cbdee1b06a21b25b222a (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=bd5323ebea446fcf077f3db21452c6ec0d36f1e5
commit bd5323ebea446fcf077f3db21452c6ec0d36f1e5
Merge: bd0ac69 3f1d314
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 08:42:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 18 08:42:22 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f1d31429e5ba28be1cd550e05040865c1555b7a
commit 3f1d31429e5ba28be1cd550e05040865c1555b7a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 14:32:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 14:42:01 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..c25b541 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;

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

Summary of changes:
 Source/cmGetCMakePropertyCommand.cxx |    5 ++++-
 Source/cmMacroCommand.cxx            |    2 +-
 Source/cmMakefile.cxx                |   17 -----------------
 Source/cmMakefile.h                  |   11 -----------
 4 files changed, 5 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
CMake