ENH: Removing collapsing of files to full path before checking. The current working directory is set correctly because the dependency lines are used by make anyway. This drastically improves the speed of dependency checking.
This commit is contained in:
parent
3d9d893426
commit
6d487c33d4
|
@ -198,26 +198,12 @@ bool cmDependsC::CheckDependencies(std::istream& is)
|
||||||
dependee = dependee.substr(0, pos+1);
|
dependee = dependee.substr(0, pos+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert dependee to a full path.
|
|
||||||
if(!cmSystemTools::FileIsFullPath(dependee.c_str()))
|
|
||||||
{
|
|
||||||
dependee = cmSystemTools::CollapseFullPath(dependee.c_str(),
|
|
||||||
m_Directory.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Strip whitespace from the depender.
|
// Strip whitespace from the depender.
|
||||||
if((pos = depender.find_last_not_of(" \t\r\n")) != std::string::npos)
|
if((pos = depender.find_last_not_of(" \t\r\n")) != std::string::npos)
|
||||||
{
|
{
|
||||||
depender = depender.substr(0, pos+1);
|
depender = depender.substr(0, pos+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert depender to a full path.
|
|
||||||
if(!cmSystemTools::FileIsFullPath(depender.c_str()))
|
|
||||||
{
|
|
||||||
depender = cmSystemTools::CollapseFullPath(depender.c_str(),
|
|
||||||
m_Directory.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dependencies must be regenerated if the dependee does not exist
|
// Dependencies must be regenerated if the dependee does not exist
|
||||||
// or if the depender exists and is older than the dependee.
|
// or if the depender exists and is older than the dependee.
|
||||||
int result = 0;
|
int result = 0;
|
||||||
|
|
Loading…
Reference in New Issue