reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-28 14:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmSourceFile: Check if a file is GENERATED first in the full path computation

Browse Source 
In `cmSourceFile::FindFullPath` check first if the file is GENERATED before
aborting on `FindFullPathFailed`.  This allows recomputation of the full path
when the GENERATED property was set after the file path was computed with an
error.
This commit is contained in:
Sebastian Holtermann 2019-02-01 17:11:49 +01:00
parent cd8a930d61
commit 254b7260f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmSourceFile.cxx
View File

@ -113,11 +113,6 @@ std::string const& cmSourceFile::GetFullPath() const
bool cmSourceFile::FindFullPath(std::string* error)
{
// If this method has already failed once do not try again.
if (this->FindFullPathFailed) {
return false;
}
// If the file is generated compute the location without checking on disk.
if (this->GetIsGenerated()) {
// The file is either already a full path or is relative to the
@ -127,6 +122,11 @@ bool cmSourceFile::FindFullPath(std::string* error)
return true;
}
// If this method has already failed once do not try again.
if (this->FindFullPathFailed) {
return false;
}
// The file is not generated. It must exist on disk.
cmMakefile const* makefile = this->Location.GetMakefile();
// Location path