From 08a31885c1eff9ed630d831ed38e231287c2c719 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 1 Dec 2010 11:43:30 -0500 Subject: [PATCH] Skip VS <= 7.1 dependency analysis for VS >= 8 Commit 1a0c166 (Store direct dependencies in solutions for VS >= 8, 2010-08-20) disabled use of VS-specific global dependency analysis. Avoid perfoming the analysis at all when it is not needed. This also prevents creation of bogus and unused '_UTILITY' targets since they are not needed for dependencies. --- Source/cmGlobalVisualStudio8Generator.cxx | 8 ++++++++ Source/cmGlobalVisualStudio8Generator.h | 1 + 2 files changed, 9 insertions(+) diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 76d01e7606..2d080df2b4 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -288,6 +288,14 @@ cmGlobalVisualStudio8Generator } } +//---------------------------------------------------------------------------- +bool cmGlobalVisualStudio8Generator::ComputeTargetDepends() +{ + // Skip over the cmGlobalVisualStudioGenerator implementation! + // We do not need the support that VS <= 7.1 needs. + return this->cmGlobalGenerator::ComputeTargetDepends(); +} + //---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator::WriteProjectDepends( std::ostream& fout, const char*, const char*, cmTarget& t) diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h index 95b6a17c96..e0913edeb7 100644 --- a/Source/cmGlobalVisualStudio8Generator.h +++ b/Source/cmGlobalVisualStudio8Generator.h @@ -78,6 +78,7 @@ protected: virtual void WriteProjectConfigurations(std::ostream& fout, const char* name, bool partOfDefaultBuild); + virtual bool ComputeTargetDepends(); virtual void WriteProjectDepends(std::ostream& fout, const char* name, const char* path, cmTarget &t);