Merge topic '13582_configured_file_regeneration'
8fbf39a
cmMakefile: Do not track configured files known to be temporary
This commit is contained in:
commit
58c5dc37d3
|
@ -3363,7 +3363,11 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
|
||||||
std::string sinfile = infile;
|
std::string sinfile = infile;
|
||||||
this->AddCMakeDependFile(sinfile);
|
this->AddCMakeDependFile(sinfile);
|
||||||
cmSystemTools::ConvertToUnixSlashes(soutfile);
|
cmSystemTools::ConvertToUnixSlashes(soutfile);
|
||||||
this->AddCMakeOutputFile(soutfile);
|
// Re-generate if non-temporary outputs are missing.
|
||||||
|
if(soutfile.find("CMakeTmp") == soutfile.npos)
|
||||||
|
{
|
||||||
|
this->AddCMakeOutputFile(soutfile);
|
||||||
|
}
|
||||||
mode_t perm = 0;
|
mode_t perm = 0;
|
||||||
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
|
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
|
||||||
std::string::size_type pos = soutfile.rfind('/');
|
std::string::size_type pos = soutfile.rfind('/');
|
||||||
|
|
Loading…
Reference in New Issue