From 94d8d25fd3d038f592002829f8f2f5b390c13623 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 10 Mar 2004 14:33:18 -0500 Subject: [PATCH] ENH: update vs71 generator to support excluded subdirs --- Source/cmGlobalVisualStudio71Generator.cxx | 7 ++++++- Source/cmGlobalVisualStudio71Generator.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 9055ccb49..8ddb74ee3 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -41,6 +41,7 @@ cmLocalGenerator *cmGlobalVisualStudio71Generator::CreateLocalGenerator() // Write a SLN file to the stream void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout, + cmLocalGenerator* root, std::vector& generators) { // Write out the header for a SLN file @@ -56,7 +57,11 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout, // add it to this SLN file unsigned int i; for(i = 0; i < generators.size(); ++i) - { + { + if(this->IsExcluded(root, generators[i])) + { + continue; + } cmMakefile* mf = generators[i]->GetMakefile(); // Get the source directory from the makefile diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h index 243495128..7c738c633 100644 --- a/Source/cmGlobalVisualStudio71Generator.h +++ b/Source/cmGlobalVisualStudio71Generator.h @@ -43,7 +43,8 @@ public: virtual cmLocalGenerator *CreateLocalGenerator(); protected: - virtual void WriteSLNFile(std::ostream& fout, + virtual void WriteSLNFile(std::ostream& fout, + cmLocalGenerator* root, std::vector& generators); virtual void WriteProject(std::ostream& fout, const char* name, const char* path,