Explorar o código

BUG: On Windows network paths do not really work as regular paths, so when the binary directory is on the network, we will not support relative paths

Andy Cedilnik %!s(int64=22) %!d(string=hai) anos
pai
achega
b5035770bc
Modificáronse 1 ficheiros con 6 adicións e 0 borrados
  1. 6 0
      Source/cmLocalGenerator.cxx

+ 6 - 0
Source/cmLocalGenerator.cxx

@@ -65,6 +65,12 @@ void cmLocalGenerator::ConfigureFinalPass()
 
 std::string cmLocalGenerator::ConvertToRelativeOutputPath(const char* p)
 {
+  const char* outputDirectory = m_Makefile->GetHomeOutputDirectory();
+  if ( outputDirectory && *outputDirectory && *(outputDirectory+1) && 
+    outputDirectory[0] == '/' && outputDirectory[1] == '/' )
+    {
+    return cmSystemTools::ConvertToOutputPath(p);
+    }
   // The first time this is called, initialize all
   // the path ivars that are used.   This can not 
   // be moved to the constructor because all the paths are not set yet.