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 f819cf535653a2ff9aad630ce4b767421627c42e (commit) via c021f59c1f2f3d892b621a9ba163b069f2a2f0a9 (commit) via 2d130896a05ef14f2ef53ed472c6926a85cc5399 (commit) via f19692342ba41ddb2638e118e2864bceca77af59 (commit) via 1116698a89e4057300481bac8f38bfd95f4e9ce5 (commit) via 8804c3e0e419eb692ba487ffb2a7e36b1f8e728d (commit) from 9462da361295122182406dbddfb5107694ab759a (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=f819cf535653a2ff9aad630ce4b767421627c42e commit f819cf535653a2ff9aad630ce4b767421627c42e Merge: 9462da3 c021f59 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sat Feb 21 05:31:14 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Feb 21 05:31:14 2015 -0500 Merge topic 'minor-cleanups' into next c021f59c cmMakefile: Store macro list in a vector not in a map. 2d130896 cmMakefile: Fix list of macros generation. f1969234 cmFunctionCommand: Remove ineffectual code. 1116698a cmTarget: Don't needlessly clear vectors in the destructor. 8804c3e0 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c021f59c1f2f3d892b621a9ba163b069f2a2f0a9 commit c021f59c1f2f3d892b621a9ba163b069f2a2f0a9 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sat Feb 21 11:25:47 2015 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Sat Feb 21 11:25:47 2015 +0100 cmMakefile: Store macro list in a vector not in a map. The signature was computed (incorrectly) and stored as the map value, but never used. Remove it now. diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx index 84c00ba..fd18596 100644 --- a/Source/cmGetCMakePropertyCommand.cxx +++ b/Source/cmGetCMakePropertyCommand.cxx @@ -39,6 +39,7 @@ bool cmGetCMakePropertyCommand } else if ( args[1] == "MACROS" ) { + output.clear(); this->Makefile->GetListOfMacros(output); } else if ( args[1] == "COMPONENTS" ) diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 29e8cb1..12c8576 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -224,15 +224,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, // if this is the endmacro for this macro then execute if (!this->Depth) { - std::string name = this->Args[0]; - name += "("; - if (!this->Args.empty()) - { - name += " "; - name += cmJoin(this->Args, " "); - } - name += " )"; - mf.AddMacro(this->Args[0].c_str(), name.c_str()); + mf.AddMacro(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 ab0d60a..93b2ce6 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -143,7 +143,7 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals) this->LocalGenerator = mf.LocalGenerator; this->FunctionBlockers = mf.FunctionBlockers; - this->MacrosMap = mf.MacrosMap; + this->MacrosList = mf.MacrosList; this->SubDirectoryOrder = mf.SubDirectoryOrder; this->Properties = mf.Properties; this->PreOrder = mf.PreOrder; @@ -3739,26 +3739,16 @@ cmVariableWatch *cmMakefile::GetVariableWatch() const } #endif -void cmMakefile::AddMacro(const char* name, const char* signature) +void cmMakefile::AddMacro(const char* name) { - if ( !name || !signature ) - { - return; - } - this->MacrosMap[name] = signature; + assert(name); + this->MacrosList.push_back(name); } void cmMakefile::GetListOfMacros(std::string& macros) const { - StringStringMap::const_iterator it; - macros = ""; - const char* sep = ""; - for ( it = this->MacrosMap.begin(); it != this->MacrosMap.end(); ++it ) - { - macros += sep; - macros += it->first; - sep = ";"; - } + assert(macros.empty()); + macros = cmJoin(this->MacrosList, ";"); } cmCacheManager *cmMakefile::GetCacheManager() const diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 895a2fc..e98f1d9 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -841,7 +841,7 @@ public: * 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, const char* signature); + void AddMacro(const char* name); ///! Add a new cmTest to the list of tests for this makefile. cmTest* CreateTest(const std::string& testName); @@ -1065,8 +1065,7 @@ private: std::stack<int> LoopBlockCounter; - typedef std::map<std::string, std::string> StringStringMap; - StringStringMap MacrosMap; + std::vector<std::string> MacrosList; std::map<std::string, bool> SubDirectoryOrder; http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d130896a05ef14f2ef53ed472c6926a85cc5399 commit 2d130896a05ef14f2ef53ed472c6926a85cc5399 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sat Feb 21 11:24:24 2015 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Sat Feb 21 11:25:26 2015 +0100 cmMakefile: Fix list of macros generation. It was broken by commit 7ee56f03 (Convert loops into the commonly used pattern., 2015-01-17). diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ac5fec9..ab0d60a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3757,7 +3757,7 @@ void cmMakefile::GetListOfMacros(std::string& macros) const { macros += sep; macros += it->first; - sep = ""; + sep = ";"; } } http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19692342ba41ddb2638e118e2864bceca77af59 commit f19692342ba41ddb2638e118e2864bceca77af59 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sat Feb 21 11:01:21 2015 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Sat Feb 21 11:02:03 2015 +0100 cmFunctionCommand: Remove ineffectual code. The name variable is never used. diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index a4d9357..9297688 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -175,11 +175,6 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, // if this is the endfunction for this function then execute if (!this->Depth) { - std::string name = this->Args[0]; - name += "( "; - name += cmJoin(this->Args, " "); - name += " )"; - // create a new command and add it to cmake cmFunctionHelperCommand *f = new cmFunctionHelperCommand(); f->Args = this->Args; http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1116698a89e4057300481bac8f38bfd95f4e9ce5 commit 1116698a89e4057300481bac8f38bfd95f4e9ce5 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sat Feb 21 11:00:14 2015 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Sat Feb 21 11:00:14 2015 +0100 cmTarget: Don't needlessly clear vectors in the destructor. This will be done anyway for us. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 1ad0d48..1e47294 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -6875,11 +6875,11 @@ cmTargetInternalPointer //---------------------------------------------------------------------------- cmTargetInternalPointer::~cmTargetInternalPointer() { - deleteAndClear(this->Pointer->IncludeDirectoriesEntries); - deleteAndClear(this->Pointer->CompileOptionsEntries); - deleteAndClear(this->Pointer->CompileFeaturesEntries); - deleteAndClear(this->Pointer->CompileDefinitionsEntries); - deleteAndClear(this->Pointer->SourceEntries); + cmDeleteAll(this->Pointer->IncludeDirectoriesEntries); + cmDeleteAll(this->Pointer->CompileOptionsEntries); + cmDeleteAll(this->Pointer->CompileFeaturesEntries); + cmDeleteAll(this->Pointer->CompileDefinitionsEntries); + cmDeleteAll(this->Pointer->SourceEntries); delete this->Pointer; } ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmFunctionCommand.cxx | 5 ----- Source/cmGetCMakePropertyCommand.cxx | 1 + Source/cmMacroCommand.cxx | 10 +--------- Source/cmMakefile.cxx | 22 ++++++---------------- Source/cmMakefile.h | 5 ++--- Source/cmTarget.cxx | 10 +++++----- 7 files changed, 16 insertions(+), 39 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits