Browse Source

Merge topic '13582_configured_file_regeneration'

8fbf39a cmMakefile: Do not track configured files known to be temporary
Brad King 12 years ago
parent
commit
58c5dc37d3
1 changed files with 5 additions and 1 deletions
  1. 5 1
      Source/cmMakefile.cxx

+ 5 - 1
Source/cmMakefile.cxx

@@ -3363,7 +3363,11 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
   std::string sinfile = infile;
   this->AddCMakeDependFile(sinfile);
   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;
   cmSystemTools::GetPermissions(sinfile.c_str(), perm);
   std::string::size_type pos = soutfile.rfind('/');