cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget.
This commit is contained in:
parent
50dc9b4440
commit
1abc20d81d
|
@ -4473,6 +4473,14 @@ std::string cmGeneratorTarget::GetDirectory(const std::string& config,
|
|||
return "";
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config,
|
||||
bool implib) const
|
||||
{
|
||||
std::string dir;
|
||||
return this->Target->ComputeOutputDir(config, implib, dir);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
void
|
||||
cmGeneratorTarget::ComputeLinkInterfaceLibraries(
|
||||
|
|
|
@ -285,6 +285,10 @@ public:
|
|||
std::vector<cmSourceFile*> const*
|
||||
GetSourceDepends(cmSourceFile const* sf) const;
|
||||
|
||||
/** Return whether this target uses the default value for its output
|
||||
directory. */
|
||||
bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
|
||||
|
||||
/** Get the name of the pdb file for the target. */
|
||||
std::string GetPDBName(const std::string& config="") const;
|
||||
|
||||
|
|
|
@ -1975,7 +1975,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
|
|||
{
|
||||
if(this->XcodeVersion >= 21)
|
||||
{
|
||||
if(!target.UsesDefaultOutputDir(configName, false))
|
||||
if(!gtgt->UsesDefaultOutputDir(configName, false))
|
||||
{
|
||||
std::string pncdir = gtgt->GetDirectory(configName);
|
||||
buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
|
||||
|
|
|
@ -2666,14 +2666,6 @@ bool cmTarget::ComputePDBOutputDir(const std::string& kind,
|
|||
return true;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
bool cmTarget::UsesDefaultOutputDir(const std::string& config,
|
||||
bool implib) const
|
||||
{
|
||||
std::string dir;
|
||||
return this->ComputeOutputDir(config, implib, dir);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
std::string cmTarget::GetFrameworkVersion() const
|
||||
{
|
||||
|
|
|
@ -312,10 +312,6 @@ public:
|
|||
/** Get a build-tree directory in which to place target support files. */
|
||||
std::string GetSupportDirectory() const;
|
||||
|
||||
/** Return whether this target uses the default value for its output
|
||||
directory. */
|
||||
bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
|
||||
|
||||
/** @return whether this target have a well defined output file name. */
|
||||
bool HaveWellDefinedOutputFiles() const;
|
||||
|
||||
|
|
Loading…
Reference in New Issue