kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.

This commit is contained in:
Stephen Kelly 2015-10-20 00:42:01 +02:00
parent 311018e5ad
commit 3ebc62850c
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGeneratorTarget.cxx
View File

@ -1708,6 +1708,16 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
return this->Target->GetBacktrace(); return this->Target->GetBacktrace();
} }
//----------------------------------------------------------------------------
bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
{
return
this->GetType() == cmState::STATIC_LIBRARY ||
this->GetType() == cmState::SHARED_LIBRARY ||
this->GetType() == cmState::MODULE_LIBRARY ||
this->GetType() == cmState::EXECUTABLE;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmGeneratorTarget::GetExportMacro() const const char* cmGeneratorTarget::GetExportMacro() const
{ {
@ -4819,7 +4829,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
} }
// Only libraries and executables have well-defined output files. // Only libraries and executables have well-defined output files.
if(!this->Target->HaveWellDefinedOutputFiles()) if(!this->HaveWellDefinedOutputFiles())
{ {
std::string msg = "cmGeneratorTarget::GetOutputInfo called for "; std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
msg += this->GetName(); msg += this->GetName();

3
Source/cmGeneratorTarget.h
View File

@ -196,6 +196,9 @@ public:
std::string GetModuleDefinitionFile(const std::string& config) const; std::string GetModuleDefinitionFile(const std::string& config) const;
/** @return whether this target have a well defined output file name. */
bool HaveWellDefinedOutputFiles() const;
/** Link information from the transitive closure of the link /** Link information from the transitive closure of the link
implementation and the interfaces of its dependencies. */ implementation and the interfaces of its dependencies. */
struct LinkClosure struct LinkClosure

2
Source/cmOSXBundleGenerator.cxx
View File

@ -34,7 +34,7 @@ cmOSXBundleGenerator(cmGeneratorTarget* target,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmOSXBundleGenerator::MustSkip() bool cmOSXBundleGenerator::MustSkip()
{ {
return !this->GT->Target->HaveWellDefinedOutputFiles(); return !this->GT->HaveWellDefinedOutputFiles();
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

10
Source/cmTarget.cxx
View File

@ -1559,16 +1559,6 @@ void cmTarget::MarkAsImported()
this->IsImportedTarget = true; this->IsImportedTarget = true;
} }
//----------------------------------------------------------------------------
bool cmTarget::HaveWellDefinedOutputFiles() const
{
return
this->GetType() == cmState::STATIC_LIBRARY ||
this->GetType() == cmState::SHARED_LIBRARY ||
this->GetType() == cmState::MODULE_LIBRARY ||
this->GetType() == cmState::EXECUTABLE;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const
{ {

3
Source/cmTarget.h
View File

@ -241,9 +241,6 @@ public:
/** Get a backtrace from the creation of the target. */ /** Get a backtrace from the creation of the target. */
cmListFileBacktrace const& GetBacktrace() const; cmListFileBacktrace const& GetBacktrace() const;
/** @return whether this target have a well defined output file name. */
bool HaveWellDefinedOutputFiles() const;
void InsertInclude(std::string const& entry, void InsertInclude(std::string const& entry,
cmListFileBacktrace const& bt, cmListFileBacktrace const& bt,
bool before = false); bool before = false);