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

Merge topic 'clean-up-include_regular_expression' 

4efda261 cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.
This commit is contained in:
Brad King 2015-07-21 09:22:15 -04:00 committed by CMake Topic Stage
parent ce597a022b 4efda261fe
commit 64aa41b248
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst
View File

@ -3,6 +3,7 @@ INCLUDE_REGULAR_EXPRESSION
Include file scanning regular expression.
This read-only property specifies the regular expression used during
This property specifies the regular expression used during
dependency scanning to match include files that should be followed.
See the include_regular_expression command.
See the :command:`include_regular_expression` command for a high-level
interface to set this property.

2
Source/cmMakeDepend.cxx
View File

@ -49,7 +49,7 @@ void cmMakeDepend::SetMakefile(cmMakefile* makefile)
// Now extract the include file regular expression from the makefile.
this->IncludeFileRegularExpression.compile(
this->Makefile->IncludeFileRegularExpression.c_str());
this->Makefile->GetIncludeRegularExpression());
this->ComplainFileRegularExpression.compile(
this->Makefile->ComplainFileRegularExpression.c_str());

14
Source/cmMakefile.cxx
View File

@ -151,7 +151,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
@ -1610,7 +1610,6 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
this->ProjectName = parent->ProjectName;
// Copy include regular expressions.
this->IncludeFileRegularExpression = parent->IncludeFileRegularExpression;
this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
// Imported targets.
@ -4184,12 +4183,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);
}
@ -4256,11 +4249,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")
{
std::vector<std::string> listFiles;

5
Source/cmMakefile.h
View File

@ -387,11 +387,11 @@ public:
*/
void SetIncludeRegularExpression(const char* regex)
{
this->IncludeFileRegularExpression = regex;
this->SetProperty("INCLUDE_REGULAR_EXPRESSION", regex);
}
const char* GetIncludeRegularExpression() const
{
return this->IncludeFileRegularExpression.c_str();
return this->GetProperty("INCLUDE_REGULAR_EXPRESSION");
}
/**
@ -873,7 +873,6 @@ protected:
std::vector<cmInstallGenerator*> InstallGenerators;
std::vector<cmTestGenerator*> TestGenerators;
std::string IncludeFileRegularExpression;
std::string ComplainFileRegularExpression;
std::vector<std::string> SourceFileExtensions;
std::vector<std::string> HeaderFileExtensions;