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:
parent
d9ec3bbe43
commit
7fbd4161d5
|
@ -123,6 +123,7 @@ cmCAStringVector::cmCAStringVector(cmCommandArgumentsHelper* args,
|
||||||
const char* key,
|
const char* key,
|
||||||
cmCommandArgumentGroup* group)
|
cmCommandArgumentGroup* group)
|
||||||
:cmCommandArgument(args, key, group)
|
:cmCommandArgument(args, key, group)
|
||||||
|
,Ignore(0)
|
||||||
{
|
{
|
||||||
if ((key==0) || (*key==0))
|
if ((key==0) || (*key==0))
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,12 +26,12 @@ std::string cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
|
||||||
std::string fullName;
|
std::string fullName;
|
||||||
if (globalGenerator)
|
if (globalGenerator)
|
||||||
{
|
{
|
||||||
fullName = globalGenerator;
|
|
||||||
if (extraGenerator && *extraGenerator)
|
if (extraGenerator && *extraGenerator)
|
||||||
{
|
{
|
||||||
|
fullName = extraGenerator;
|
||||||
fullName += " - ";
|
fullName += " - ";
|
||||||
fullName += extraGenerator;
|
|
||||||
}
|
}
|
||||||
|
fullName += globalGenerator;
|
||||||
}
|
}
|
||||||
return fullName;
|
return fullName;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1422,7 +1422,6 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
|
||||||
void cmake::AddExtraGenerator(const char* name,
|
void cmake::AddExtraGenerator(const char* name,
|
||||||
CreateExtraGeneratorFunctionType newFunction)
|
CreateExtraGeneratorFunctionType newFunction)
|
||||||
{
|
{
|
||||||
this->ExtraGenerators[name] = newFunction;
|
|
||||||
cmExternalMakefileProjectGenerator* extraGenerator = newFunction();
|
cmExternalMakefileProjectGenerator* extraGenerator = newFunction();
|
||||||
const std::vector<std::string>& supportedGlobalGenerators =
|
const std::vector<std::string>& supportedGlobalGenerators =
|
||||||
extraGenerator->GetSupportedGlobalGenerators();
|
extraGenerator->GetSupportedGlobalGenerators();
|
||||||
|
@ -1448,7 +1447,12 @@ void cmake::AddDefaultExtraGenerators()
|
||||||
#endif
|
#endif
|
||||||
// e.g. eclipse ?
|
// e.g. eclipse ?
|
||||||
#ifdef CMAKE_USE_KDEVELOP
|
#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
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue