diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-10-19 22:44:15 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-20 22:52:22 (GMT) |
commit | 6d94078e623d5f1316f1972ffda06ac1d66b6f2f (patch) | |
tree | d1d5d0ec8710fdae937cfbd9627015376bc3c12a /Source/cmGeneratorTarget.cxx | |
parent | 3ebc62850c7461dca4723b063b5e5f019409db84 (diff) | |
download | CMake-6d94078e623d5f1316f1972ffda06ac1d66b6f2f.zip CMake-6d94078e623d5f1316f1972ffda06ac1d66b6f2f.tar.gz CMake-6d94078e623d5f1316f1972ffda06ac1d66b6f2f.tar.bz2 |
cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 1483af7..6e312ce 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -304,6 +304,10 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg) t->GetSourceEntries(), t->GetSourceBacktraces(), this->SourceEntries, true); + + this->DLLPlatform = (this->Makefile->IsOn("WIN32") || + this->Makefile->IsOn("CYGWIN") || + this->Makefile->IsOn("MINGW")); } cmGeneratorTarget::~cmGeneratorTarget() @@ -366,7 +370,7 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const switch(this->GetType()) { case cmState::SHARED_LIBRARY: - if(this->Target->IsDLLPlatform()) + if(this->IsDLLPlatform()) { if(implib) { @@ -2058,6 +2062,11 @@ cmGeneratorTarget::GetModuleDefinitionFile(const std::string& config) const return data; } +bool cmGeneratorTarget::IsDLLPlatform() const +{ + return this->DLLPlatform; +} + //---------------------------------------------------------------------------- void cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs, @@ -5964,7 +5973,7 @@ bool cmGeneratorTarget::IsExecutableWithExports() const //---------------------------------------------------------------------------- bool cmGeneratorTarget::HasImportLibrary() const { - return (this->Target->IsDLLPlatform() && + return (this->IsDLLPlatform() && (this->GetType() == cmState::SHARED_LIBRARY || this->IsExecutableWithExports())); } |