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/cmMakefileTargetGenerator.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/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index abcda21..9b0e5dd 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -542,10 +542,10 @@ cmMakefileTargetGenerator std::string targetFullPathReal; std::string targetFullPathPDB; std::string targetFullPathCompilePDB; - 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) { targetFullPathReal = this->GeneratorTarget->GetFullPath(this->ConfigName, false, true); @@ -554,7 +554,7 @@ cmMakefileTargetGenerator targetFullPathPDB += "/"; targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName); } - if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY) + if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY) { targetFullPathCompilePDB = this->GeneratorTarget->GetCompilePDBPath(this->ConfigName); @@ -1445,7 +1445,7 @@ void cmMakefileTargetGenerator ::AppendTargetDepends(std::vector<std::string>& depends) { // Static libraries never depend on anything for linking. - if(this->Target->GetType() == cmTarget::STATIC_LIBRARY) + if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY) { return; } |