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

BUG: Don't enable generate if configure completed with errors. 

ENH:  Allow build w/ Qt configured with no STL support.
This commit is contained in:
Clinton Stimpson 2007-11-08 16:47:00 -05:00
parent af46642deb
commit 3cd1d6e9e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/QtDialog/CMakeSetupDialog.cxx
View File

@ -284,7 +284,7 @@ void CMakeSetupDialog::finishConfigure(int err)
tr("Error in configuration process, project files may be invalid"), tr("Error in configuration process, project files may be invalid"),
QMessageBox::Ok); QMessageBox::Ok);
} }
if(!this->CacheValues->cacheModel()->modifiedValues()) else if(!this->CacheValues->cacheModel()->modifiedValues())
{ {
this->setGenerateEnabled(true); this->setGenerateEnabled(true);
} }

4
Source/QtDialog/QCMake.cxx
View File

@ -54,7 +54,7 @@ QCMake::QCMake(QObject* p)
std::vector<std::string>::iterator iter; std::vector<std::string>::iterator iter;
for(iter = generators.begin(); iter != generators.end(); ++iter) for(iter = generators.begin(); iter != generators.end(); ++iter)
{ {
this->AvailableGenerators.append(QString::fromStdString(*iter)); this->AvailableGenerators.append(iter->c_str());
} }
} }
@ -107,7 +107,7 @@ void QCMake::setBinaryDirectory(const QString& dir)
const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR"); const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR");
std::string curGen = cmExternalMakefileProjectGenerator:: std::string curGen = cmExternalMakefileProjectGenerator::
CreateFullGeneratorName(itm.GetValue(), extraGen); CreateFullGeneratorName(itm.GetValue(), extraGen);
this->setGenerator(QString::fromStdString(curGen)); this->setGenerator(curGen.c_str());
} }
} }
} }