cmLocalGenerator: Remove CreateCustomTargetsAndCommands method.
It loops over cmGeneratorTargets, but at the point it is called, there are no cmGeneratorTargets. This must be dead code.
This commit is contained in:
parent
58811998fb
commit
72f43fa13d
|
@ -626,48 +626,6 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang,
|
||||||
target.Target->AddSource(targetFullPath);
|
target.Target->AddSource(targetFullPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void cmLocalGenerator
|
|
||||||
::CreateCustomTargetsAndCommands(std::set<std::string> const& lang)
|
|
||||||
{
|
|
||||||
cmGeneratorTargetsType tgts = this->Makefile->GetGeneratorTargets();
|
|
||||||
for(cmGeneratorTargetsType::iterator l = tgts.begin();
|
|
||||||
l != tgts.end(); l++)
|
|
||||||
{
|
|
||||||
if (l->first->IsImported())
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
cmGeneratorTarget& target = *l->second;
|
|
||||||
switch(target.GetType())
|
|
||||||
{
|
|
||||||
case cmTarget::STATIC_LIBRARY:
|
|
||||||
case cmTarget::SHARED_LIBRARY:
|
|
||||||
case cmTarget::MODULE_LIBRARY:
|
|
||||||
case cmTarget::EXECUTABLE:
|
|
||||||
{
|
|
||||||
std::string llang = target.Target->GetLinkerLanguage();
|
|
||||||
if(llang.empty())
|
|
||||||
{
|
|
||||||
cmSystemTools::Error
|
|
||||||
("CMake can not determine linker language for target: ",
|
|
||||||
target.Target->GetName().c_str());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// if the language is not in the set lang then create custom
|
|
||||||
// commands to build the target
|
|
||||||
if(lang.count(llang) == 0)
|
|
||||||
{
|
|
||||||
this->AddBuildTargetRule(llang, target);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// List of variables that are replaced when
|
// List of variables that are replaced when
|
||||||
// rules are expanced. These variables are
|
// rules are expanced. These variables are
|
||||||
// replaced in the form <var> with GetSafeDefinition(var).
|
// replaced in the form <var> with GetSafeDefinition(var).
|
||||||
|
|
|
@ -338,12 +338,6 @@ protected:
|
||||||
const std::string& lang,
|
const std::string& lang,
|
||||||
cmSourceFile& source,
|
cmSourceFile& source,
|
||||||
cmGeneratorTarget& target);
|
cmGeneratorTarget& target);
|
||||||
// Create Custom Targets and commands for unsupported languages
|
|
||||||
// The set passed in should contain the languages supported by the
|
|
||||||
// generator directly. Any targets containing files that are not
|
|
||||||
// of the types listed will be compiled as custom commands and added
|
|
||||||
// to a custom target.
|
|
||||||
void CreateCustomTargetsAndCommands(std::set<std::string> const&);
|
|
||||||
|
|
||||||
// Handle old-style install rules stored in the targets.
|
// Handle old-style install rules stored in the targets.
|
||||||
void GenerateTargetInstallRules(
|
void GenerateTargetInstallRules(
|
||||||
|
|
|
@ -82,14 +82,6 @@ private:
|
||||||
std::string Event;
|
std::string Event;
|
||||||
};
|
};
|
||||||
|
|
||||||
void cmLocalVisualStudio6Generator::AddHelperCommands()
|
|
||||||
{
|
|
||||||
std::set<std::string> lang;
|
|
||||||
lang.insert("C");
|
|
||||||
lang.insert("CXX");
|
|
||||||
this->CreateCustomTargetsAndCommands(lang);
|
|
||||||
}
|
|
||||||
|
|
||||||
void cmLocalVisualStudio6Generator::AddCMakeListsRules()
|
void cmLocalVisualStudio6Generator::AddCMakeListsRules()
|
||||||
{
|
{
|
||||||
cmTargets &tgts = this->Makefile->GetTargets();
|
cmTargets &tgts = this->Makefile->GetTargets();
|
||||||
|
|
|
@ -35,7 +35,6 @@ public:
|
||||||
|
|
||||||
virtual ~cmLocalVisualStudio6Generator();
|
virtual ~cmLocalVisualStudio6Generator();
|
||||||
|
|
||||||
virtual void AddHelperCommands();
|
|
||||||
virtual void AddCMakeListsRules();
|
virtual void AddCMakeListsRules();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -68,15 +68,6 @@ cmLocalVisualStudio7Generator::~cmLocalVisualStudio7Generator()
|
||||||
|
|
||||||
void cmLocalVisualStudio7Generator::AddHelperCommands()
|
void cmLocalVisualStudio7Generator::AddHelperCommands()
|
||||||
{
|
{
|
||||||
std::set<std::string> lang;
|
|
||||||
lang.insert("C");
|
|
||||||
lang.insert("CXX");
|
|
||||||
lang.insert("RC");
|
|
||||||
lang.insert("IDL");
|
|
||||||
lang.insert("DEF");
|
|
||||||
lang.insert("Fortran");
|
|
||||||
this->CreateCustomTargetsAndCommands(lang);
|
|
||||||
|
|
||||||
// Now create GUIDs for targets
|
// Now create GUIDs for targets
|
||||||
cmTargets &tgts = this->Makefile->GetTargets();
|
cmTargets &tgts = this->Makefile->GetTargets();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue