Simplify 'strip' and 'ranlib' install tweak code
The cmInstallTargetGenerator methods AddStripRule and AddRanlibRule do not need the target type argument. They can simply use the type of the target for which the generator instance was created.
This commit is contained in:
parent
e4897a78b9
commit
3c326476ee
|
@ -315,8 +315,8 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
|
||||||
cmOStringStream tw;
|
cmOStringStream tw;
|
||||||
this->AddInstallNamePatchRule(tw, indent.Next(), config, toDestDirPath);
|
this->AddInstallNamePatchRule(tw, indent.Next(), config, toDestDirPath);
|
||||||
this->AddChrpathPatchRule(tw, indent.Next(), config, toDestDirPath);
|
this->AddChrpathPatchRule(tw, indent.Next(), config, toDestDirPath);
|
||||||
this->AddRanlibRule(tw, indent.Next(), type, toDestDirPath);
|
this->AddRanlibRule(tw, indent.Next(), toDestDirPath);
|
||||||
this->AddStripRule(tw, indent.Next(), type, toDestDirPath);
|
this->AddStripRule(tw, indent.Next(), toDestDirPath);
|
||||||
std::string tws = tw.str();
|
std::string tws = tw.str();
|
||||||
|
|
||||||
// Add the rules, if any.
|
// Add the rules, if any.
|
||||||
|
@ -599,13 +599,12 @@ cmInstallTargetGenerator
|
||||||
void
|
void
|
||||||
cmInstallTargetGenerator::AddStripRule(std::ostream& os,
|
cmInstallTargetGenerator::AddStripRule(std::ostream& os,
|
||||||
Indent const& indent,
|
Indent const& indent,
|
||||||
cmTarget::TargetType type,
|
|
||||||
const std::string& toDestDirPath)
|
const std::string& toDestDirPath)
|
||||||
{
|
{
|
||||||
|
|
||||||
// don't strip static libraries, because it removes the only symbol table
|
// don't strip static libraries, because it removes the only symbol table
|
||||||
// they have so you can't link to them anymore
|
// they have so you can't link to them anymore
|
||||||
if(type == cmTarget::STATIC_LIBRARY)
|
if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -633,11 +632,10 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
|
||||||
void
|
void
|
||||||
cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
|
cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
|
||||||
Indent const& indent,
|
Indent const& indent,
|
||||||
cmTarget::TargetType type,
|
|
||||||
const std::string& toDestDirPath)
|
const std::string& toDestDirPath)
|
||||||
{
|
{
|
||||||
// Static libraries need ranlib on this platform.
|
// Static libraries need ranlib on this platform.
|
||||||
if(type != cmTarget::STATIC_LIBRARY)
|
if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,10 +74,8 @@ protected:
|
||||||
std::string const& toDestDirPath);
|
std::string const& toDestDirPath);
|
||||||
|
|
||||||
void AddStripRule(std::ostream& os, Indent const& indent,
|
void AddStripRule(std::ostream& os, Indent const& indent,
|
||||||
cmTarget::TargetType type,
|
|
||||||
const std::string& toDestDirPath);
|
const std::string& toDestDirPath);
|
||||||
void AddRanlibRule(std::ostream& os, Indent const& indent,
|
void AddRanlibRule(std::ostream& os, Indent const& indent,
|
||||||
cmTarget::TargetType type,
|
|
||||||
const std::string& toDestDirPath);
|
const std::string& toDestDirPath);
|
||||||
|
|
||||||
cmTarget* Target;
|
cmTarget* Target;
|
||||||
|
|
Loading…
Reference in New Issue