kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake-gui-args-11388' 

0476715 Fix regression to allow specifying a CMakeCache.txt file on the command line.
This commit is contained in:
David Cole 2010-11-09 15:32:43 -05:00 committed by CMake Topic Stage
parent 9692d5a2b6 0476715b87
commit 1774622487
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/QtDialog/CMakeSetup.cxx
View File

@ -165,13 +165,25 @@ int main(int argc, char** argv)
if(args.count() == 2) if(args.count() == 2)
{ {
cmsys_stl::string filePath = cmSystemTools::CollapseFullPath(args[1].toAscii().data()); cmsys_stl::string filePath = cmSystemTools::CollapseFullPath(args[1].toAscii().data());
// check if argument is a directory containing CMakeCache.txt
cmsys_stl::string buildFilePath = cmsys_stl::string buildFilePath =
cmSystemTools::CollapseFullPath("CMakeCache.txt", filePath.c_str()); cmSystemTools::CollapseFullPath("CMakeCache.txt", filePath.c_str());
// check if argument is a CMakeCache.txt file
if(cmSystemTools::GetFilenameName(filePath) == "CMakeCache.txt" &&
cmSystemTools::FileExists(filePath.c_str()))
{
buildFilePath = filePath;
}
// check if argument is a directory containing CMakeLists.txt
cmsys_stl::string srcFilePath = cmsys_stl::string srcFilePath =
cmSystemTools::CollapseFullPath("CMakeLists.txt", filePath.c_str()); cmSystemTools::CollapseFullPath("CMakeLists.txt", filePath.c_str());
if(cmSystemTools::FileExists(buildFilePath.c_str())) if(cmSystemTools::FileExists(buildFilePath.c_str()))
{ {
dialog.setBinaryDirectory(filePath.c_str()); dialog.setBinaryDirectory(cmSystemTools::GetFilenamePath(buildFilePath).c_str());
} }
else if(cmSystemTools::FileExists(srcFilePath.c_str())) else if(cmSystemTools::FileExists(srcFilePath.c_str()))
{ {