From 294dec38c96f80d960ec7aef9014b122de3492a2 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 8 Jan 2004 15:54:30 -0500 Subject: [PATCH] BUG: make sure relative paths in command line options are expanded --- Source/MFCDialog/CMakeCommandLineInfo.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/MFCDialog/CMakeCommandLineInfo.cpp b/Source/MFCDialog/CMakeCommandLineInfo.cpp index f638de6bf2..d286ea0592 100644 --- a/Source/MFCDialog/CMakeCommandLineInfo.cpp +++ b/Source/MFCDialog/CMakeCommandLineInfo.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" #include "CMakeCommandLineInfo.h" +#include "cmSystemTools.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -118,15 +119,21 @@ void CMakeCommandLineInfo::ParseParam(LPCTSTR lpszParam, BOOL bFlag, BOOL bLast) } break; case 'B': - this->m_WhereBuild = value; + { + std::string path = cmSystemTools::CollapseFullPath((const char*)value); + this->m_WhereBuild = path.c_str(); break; + } case 'G': this->m_GeneratorChoiceString = value; break; case 'H': - this->m_WhereSource = value; + { + std::string path = cmSystemTools::CollapseFullPath((const char*)value); + this->m_WhereSource = path.c_str(); break; } + } } // Call the base class to ensure proper command line processing