diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-14 21:14:43 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-14 22:41:19 (GMT) |
| commit | 983c00f8f97260e7650fcc440047b33898f0363c (patch) | |
| tree | 49fc7fc17465e7d613e82d6cf305fdc4bf3f2f12 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 088fcbf733a7d1968fc3586a7077f22cb41e1917 (diff) | |
| download | CMake-983c00f8f97260e7650fcc440047b33898f0363c.zip CMake-983c00f8f97260e7650fcc440047b33898f0363c.tar.gz CMake-983c00f8f97260e7650fcc440047b33898f0363c.tar.bz2 | |
Generators: Use GetType from the cmGeneratorTarget.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 4080d90..ec90ba5 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -189,8 +189,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language) cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const { // Static libraries never depend on other targets for linking. - if (this->Target->GetType() == cmTarget::STATIC_LIBRARY || - this->Target->GetType() == cmTarget::OBJECT_LIBRARY) + if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY || + this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY) return cmNinjaDeps(); cmComputeLinkInformation* cli = @@ -283,16 +283,16 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const { std::string pdbPath; std::string compilePdbPath; - if(this->Target->GetType() == cmTarget::EXECUTABLE || - this->Target->GetType() == cmTarget::STATIC_LIBRARY || - this->Target->GetType() == cmTarget::SHARED_LIBRARY || - this->Target->GetType() == cmTarget::MODULE_LIBRARY) + if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE || + this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY || + this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY || + this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY) { pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName()); pdbPath += "/"; pdbPath += this->GeneratorTarget->GetPDBName(this->GetConfigName()); } - if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY) + if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY) { compilePdbPath = this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName()); @@ -480,7 +480,8 @@ cmNinjaTargetGenerator cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream()); this->GetBuildFileStream() << "# Object build statements for " - << cmTarget::GetTargetTypeName(this->GetTarget()->GetType()) + << cmTarget::GetTargetTypeName( + (cmTarget::TargetType)this->GetGeneratorTarget()->GetType()) << " target " << this->GetTargetName() << "\n\n"; |