Explorar el Código

Merge topic 'cmgeneratedfs-absolute-paths'

b02ef99fea cmGeneratedFileStream: Use absolute paths

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !7524
Brad King hace 3 años
padre
commit
a3cd71af65
Se han modificado 1 ficheros con 3 adiciones y 3 borrados
  1. 3 3
      Source/cmGeneratedFileStream.cxx

+ 3 - 3
Source/cmGeneratedFileStream.cxx

@@ -124,10 +124,10 @@ cmGeneratedFileStreamBase::~cmGeneratedFileStreamBase()
 void cmGeneratedFileStreamBase::Open(std::string const& name)
 void cmGeneratedFileStreamBase::Open(std::string const& name)
 {
 {
   // Save the original name of the file.
   // Save the original name of the file.
-  this->Name = name;
+  this->Name = cmSystemTools::CollapseFullPath(name);
 
 
   // Create the name of the temporary file.
   // Create the name of the temporary file.
-  this->TempName = name;
+  this->TempName = this->Name;
 #if defined(__VMS)
 #if defined(__VMS)
   this->TempName += "_";
   this->TempName += "_";
 #else
 #else
@@ -231,7 +231,7 @@ int cmGeneratedFileStreamBase::RenameFile(std::string const& oldname,
 
 
 void cmGeneratedFileStream::SetName(const std::string& fname)
 void cmGeneratedFileStream::SetName(const std::string& fname)
 {
 {
-  this->Name = fname;
+  this->Name = cmSystemTools::CollapseFullPath(fname);
 }
 }
 
 
 void cmGeneratedFileStream::SetTempExt(std::string const& ext)
 void cmGeneratedFileStream::SetTempExt(std::string const& ext)