Răsfoiți Sursa

ENH: fix .. in the path of subdirs

Bill Hoffman 19 ani în urmă
părinte
comite
25d4127e2d
1 a modificat fișierele cu 4 adăugiri și 0 ștergeri
  1. 4 0
      Source/cmMakefile.h

+ 4 - 0
Source/cmMakefile.h

@@ -341,6 +341,8 @@ public:
     {
     {
       this->cmStartDirectory = dir;
       this->cmStartDirectory = dir;
       cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory);
       cmSystemTools::ConvertToUnixSlashes(this->cmStartDirectory);
+      this->cmStartDirectory = 
+        cmSystemTools::CollapseFullPath(this->cmStartDirectory.c_str());
       this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", 
       this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", 
                           this->cmStartDirectory.c_str());
                           this->cmStartDirectory.c_str());
     }
     }
@@ -352,6 +354,8 @@ public:
     {
     {
       this->StartOutputDirectory = lib;
       this->StartOutputDirectory = lib;
       cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
       cmSystemTools::ConvertToUnixSlashes(this->StartOutputDirectory);
+      this->StartOutputDirectory = 
+        cmSystemTools::CollapseFullPath(this->StartOutputDirectory.c_str());
       cmSystemTools::MakeDirectory(this->StartOutputDirectory.c_str());
       cmSystemTools::MakeDirectory(this->StartOutputDirectory.c_str());
       this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", 
       this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", 
                           this->StartOutputDirectory.c_str());
                           this->StartOutputDirectory.c_str());