kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'remove-special-MACROS-handling' 

41bb831f cmMakefile: Remove special handling of MACROS property.
This commit is contained in:
Brad King 2015-07-21 09:22:23 -04:00 committed by CMake Topic Stage
parent e13c189743 41bb831fc9
commit 5b2754d41f
4 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGetCMakePropertyCommand.cxx
View File

@ -40,7 +40,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" )
{

2
Source/cmMacroCommand.cxx
View File

@ -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;

17
Source/cmMakefile.cxx
View File

@ -3808,18 +3808,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();
@ -4243,11 +4231,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;

13
Source/cmMakefile.h
View File

@ -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);
@ -669,11 +663,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
*/
@ -906,8 +895,6 @@ private:
std::stack<int> LoopBlockCounter;
std::vector<std::string> MacrosList;
mutable cmsys::RegularExpression cmDefineRegex;
mutable cmsys::RegularExpression cmDefine01Regex;
mutable cmsys::RegularExpression cmAtVarRegex;