diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-28 16:48:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-29 14:43:32 (GMT) |
| commit | a1209be550172a95d3254158c121abf184e60bcd (patch) | |
| tree | df04eb1daa163880a22c0862a83f7d85f5932289 | |
| parent | 32e4f6beca6f13165ec5a40bf363d005ebda9263 (diff) | |
| download | CMake-a1209be550172a95d3254158c121abf184e60bcd.zip CMake-a1209be550172a95d3254158c121abf184e60bcd.tar.gz CMake-a1209be550172a95d3254158c121abf184e60bcd.tar.bz2 | |
VisualStudio: Skip global targets when processing.
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 1d583eb..d6973aa 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -108,6 +108,10 @@ void cmGlobalVisualStudioGenerator::Generate() for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t) { + if (t->second.GetType() == cmTarget::GLOBAL_TARGET) + { + continue; + } if(!this->IsExcluded(gen[0], t->second)) { allBuild->AddUtility(t->second.GetName()); diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index f1c8def..cab5a47 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -88,7 +88,8 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules() for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++) { - if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY) + if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY + || l->second.GetType() == cmTarget::GLOBAL_TARGET) { continue; } diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index f199a41..572dbde 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -108,6 +108,10 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules() // Add the rule to targets that need it. for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l) { + if (l->second.GetType() == cmTarget::GLOBAL_TARGET) + { + continue; + } if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET) { l->second.AddSource(sf->GetFullPath()); |