Ver código fonte

BUG: make sure relative paths in command line options are expanded

Bill Hoffman 22 anos atrás
pai
commit
294dec38c9
1 arquivos alterados com 9 adições e 2 exclusões
  1. 9 2
      Source/MFCDialog/CMakeCommandLineInfo.cpp

+ 9 - 2
Source/MFCDialog/CMakeCommandLineInfo.cpp

@@ -3,6 +3,7 @@
 
 
 #include "stdafx.h"
 #include "stdafx.h"
 #include "CMakeCommandLineInfo.h" 
 #include "CMakeCommandLineInfo.h" 
+#include "cmSystemTools.h"
 
 
 #ifdef _DEBUG
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #define new DEBUG_NEW
@@ -118,15 +119,21 @@ void CMakeCommandLineInfo::ParseParam(LPCTSTR lpszParam, BOOL bFlag, BOOL bLast)
           }
           }
         break;
         break;
       case 'B':
       case 'B':
-        this->m_WhereBuild = value;
+      {
+        std::string path = cmSystemTools::CollapseFullPath((const char*)value);
+        this->m_WhereBuild = path.c_str();
         break;
         break;
+      }
       case 'G':
       case 'G':
         this->m_GeneratorChoiceString = value;
         this->m_GeneratorChoiceString = value;
         break;
         break;
       case 'H':
       case 'H':
-        this->m_WhereSource = value;
+      {
+        std::string path = cmSystemTools::CollapseFullPath((const char*)value);
+        this->m_WhereSource = path.c_str();
         break;
         break;
       }
       }
+      }
     }
     }
 
 
   // Call the base class to ensure proper command line processing
   // Call the base class to ensure proper command line processing