cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.

It costs an extra cmMakefile member and extra code to maintain in
directory property handling.  Remove documentation note that it
is read-only and specify high-level command to populate it.
This commit is contained in:
Stephen Kelly
2015-04-04 19:21:56 +02:00
parent 52f2261685
commit 4efda261fe
4 changed files with 7 additions and 19 deletions
+1 -13
View File
@@ -150,7 +150,7 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
this->SuppressWatches = false;
// Setup the default include file regular expression (match everything).
this->IncludeFileRegularExpression = "^.*$";
this->SetProperty("INCLUDE_REGULAR_EXPRESSION", "^.*$");
// Setup the default include complaint regular expression (match nothing).
this->ComplainFileRegularExpression = "^$";
// Source and header file extensions that we can handle
@@ -1613,7 +1613,6 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
this->ProjectName = parent->ProjectName;
// Copy include regular expressions.
this->IncludeFileRegularExpression = parent->IncludeFileRegularExpression;
this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
// Imported targets.
@@ -4193,12 +4192,6 @@ void cmMakefile::SetProperty(const std::string& prop, const char* value)
return;
}
if ( prop == "INCLUDE_REGULAR_EXPRESSION" )
{
this->SetIncludeRegularExpression(value);
return;
}
this->Properties.SetProperty(prop, value);
}
@@ -4265,11 +4258,6 @@ const char *cmMakefile::GetProperty(const std::string& prop,
}
return "";
}
else if (prop == "INCLUDE_REGULAR_EXPRESSION" )
{
output = this->GetIncludeRegularExpression();
return output.c_str();
}
else if (prop == "LISTFILE_STACK")
{
output = cmJoin(this->ListFileStack, ";");