summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-12-02 19:24:45 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-12-02 19:24:45 (GMT)
commitb4bd2d3bafb11f438eb655466856c75fd1b24b05 (patch)
tree7fb79f88db8151cf78a5114c1cce571bc9a93ac5
parent746d54a8430075a634d1086f484bfe72d13293be (diff)
parent08a31885c1eff9ed630d831ed38e231287c2c719 (diff)
downloadCMake-b4bd2d3bafb11f438eb655466856c75fd1b24b05.zip
CMake-b4bd2d3bafb11f438eb655466856c75fd1b24b05.tar.gz
CMake-b4bd2d3bafb11f438eb655466856c75fd1b24b05.tar.bz2
Merge topic 'vs-target-dependencies'
08a3188 Skip VS <= 7.1 dependency analysis for VS >= 8
-rw-r--r--Source/cmGlobalVisualStudio8Generator.cxx8
-rw-r--r--Source/cmGlobalVisualStudio8Generator.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 76d01e7..2d080df 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -289,6 +289,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 95b6a17..e0913ed 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);