STYLE: name the external generator "KDevelop3 - Unix Makefiles" instead of "Unix Makefiles -

KDevelop3"
-initialize Ignore to 0, crashes otherwise

Alex
This commit is contained in:
Alexander Neundorf 2007-07-03 16:10:50 -04:00
parent d9ec3bbe43
commit 7fbd4161d5
3 changed files with 9 additions and 4 deletions

View File

@ -123,6 +123,7 @@ cmCAStringVector::cmCAStringVector(cmCommandArgumentsHelper* args,
const char* key,
cmCommandArgumentGroup* group)
:cmCommandArgument(args, key, group)
,Ignore(0)
{
if ((key==0) || (*key==0))
{

View File

@ -26,12 +26,12 @@ std::string cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
std::string fullName;
if (globalGenerator)
{
fullName = globalGenerator;
if (extraGenerator && *extraGenerator)
{
fullName = extraGenerator;
fullName += " - ";
fullName += extraGenerator;
}
fullName += globalGenerator;
}
return fullName;
}

View File

@ -1422,7 +1422,6 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
void cmake::AddExtraGenerator(const char* name,
CreateExtraGeneratorFunctionType newFunction)
{
this->ExtraGenerators[name] = newFunction;
cmExternalMakefileProjectGenerator* extraGenerator = newFunction();
const std::vector<std::string>& supportedGlobalGenerators =
extraGenerator->GetSupportedGlobalGenerators();
@ -1448,7 +1447,12 @@ void cmake::AddDefaultExtraGenerators()
#endif
// e.g. eclipse ?
#ifdef CMAKE_USE_KDEVELOP
this->AddExtraGenerator(cmGlobalKdevelopGenerator::GetActualName(), &cmGlobalKdevelopGenerator::New);
this->AddExtraGenerator(cmGlobalKdevelopGenerator::GetActualName(),
&cmGlobalKdevelopGenerator::New);
// for kdevelop also add the generator with just the name of the
// extra generator, since it was this way since cmake 2.2
this->ExtraGenerators[cmGlobalKdevelopGenerator::GetActualName()]
= &cmGlobalKdevelopGenerator::New;
#endif
}