diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-16 13:35:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-16 13:35:34 (GMT) |
| commit | f13521317a43af4ebb2996c9916d1d1da695c5fc (patch) | |
| tree | 25b68105cef1bbb59f0c9980fb86d72807a97c0a /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | a4f0b01939ca7c69c1e31f017c6e87b642388252 (diff) | |
| parent | 55474e6182b49acc4183fffdebccc7ae2a7335fa (diff) | |
| download | CMake-f13521317a43af4ebb2996c9916d1d1da695c5fc.zip CMake-f13521317a43af4ebb2996c9916d1d1da695c5fc.tar.gz CMake-f13521317a43af4ebb2996c9916d1d1da695c5fc.tar.bz2 | |
Merge topic 'clean-up-cmTarget'
55474e61 cmState: Move GetTargetTypeName from cmTarget.
38df5c36 Remove now-obsolete casts.
4ee2b267 cmGeneratorTarget: Use enum for GetType.
eac15298 cmState: Move TargetType enum from cmTarget.
482b3811 cmTarget: Move link type enum out.
2ee1cb85 cmTarget: Move ImportInfoMap out of internal class.
a48bcabd cmTarget: Move backtrace member out of internal class.
6694d993 cmTarget: Remove unneeded constructors.
983c00f8 Generators: Use GetType from the cmGeneratorTarget.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 36602d8..f3ee2e3 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -119,7 +119,7 @@ void cmLocalUnixMakefileGenerator3::Generate() for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t) { - if (t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY + if (t->second->GetType() == cmState::INTERFACE_LIBRARY || t->second->Target->IsImported()) { continue; @@ -180,7 +180,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles) ti != targets.end(); ++ti) { cmGeneratorTarget* gt = ti->second; - if (gt->GetType() == cmTarget::INTERFACE_LIBRARY) + if (gt->GetType() == cmState::INTERFACE_LIBRARY) { continue; } @@ -423,12 +423,12 @@ void cmLocalUnixMakefileGenerator3 for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t) { - if((t->second->GetType() == cmTarget::EXECUTABLE) || - (t->second->GetType() == cmTarget::STATIC_LIBRARY) || - (t->second->GetType() == cmTarget::SHARED_LIBRARY) || - (t->second->GetType() == cmTarget::MODULE_LIBRARY) || - (t->second->GetType() == cmTarget::OBJECT_LIBRARY) || - (t->second->GetType() == cmTarget::UTILITY)) + if((t->second->GetType() == cmState::EXECUTABLE) || + (t->second->GetType() == cmState::STATIC_LIBRARY) || + (t->second->GetType() == cmState::SHARED_LIBRARY) || + (t->second->GetType() == cmState::MODULE_LIBRARY) || + (t->second->GetType() == cmState::OBJECT_LIBRARY) || + (t->second->GetType() == cmState::UTILITY)) { if (t->second->Target->IsImported()) { @@ -1772,7 +1772,7 @@ void cmLocalUnixMakefileGenerator3 cmTargets::iterator glIt; for ( glIt = targets->begin(); glIt != targets->end(); ++ glIt ) { - if ( glIt->second.GetType() == cmTarget::GLOBAL_TARGET ) + if ( glIt->second.GetType() == cmState::GLOBAL_TARGET ) { std::string targetString = "Special rule for the target " + glIt->first; std::vector<std::string> commands; |