summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2009-08-10 18:32:08 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2009-08-10 18:32:08 (GMT)
commite50903248fd1330b8470df8eb12a9510c75cfdc7 (patch)
tree87c467276de7ff072a09c396bdb6208bca2ba230 /Source/QtDialog
parent37805ff81cfdcf3bde10192f08062e4a2260dd5e (diff)
downloadCMake-e50903248fd1330b8470df8eb12a9510c75cfdc7.zip
CMake-e50903248fd1330b8470df8eb12a9510c75cfdc7.tar.gz
CMake-e50903248fd1330b8470df8eb12a9510c75cfdc7.tar.bz2
ENH: Patch from Alexander Neundorf to remove "KDevelop3" from list of generators. "KDevelop3 - Unix Makefiles" should be used instead.
Diffstat (limited to 'Source/QtDialog')
-rw-r--r--Source/QtDialog/QCMake.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index 580eacc..42a2fe7 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -67,6 +67,15 @@ QCMake::QCMake(QObject* p)
std::vector<std::string>::iterator iter;
for(iter = generators.begin(); iter != generators.end(); ++iter)
{
+ // Skip the generator "KDevelop3", since there is also
+ // "KDevelop3 - Unix Makefiles", which is the full and official name.
+ // The short name is actually only still there since this was the name
+ // in CMake 2.4, to keep "command line argument compatibility", but
+ // this is not necessary in the GUI.
+ if (*iter == "KDevelop3")
+ {
+ continue;
+ }
this->AvailableGenerators.append(iter->c_str());
}
}