diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 9fe69ee569..9e4ead484e 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -299,8 +299,11 @@ void cmGlobalVisualStudio7Generator::Generate() // first do the superclass method this->cmGlobalVisualStudioGenerator::Generate(); - // Now write out the VS Solution file. - this->OutputSLNFile(); + // Now write out the VS Solution files. + for (auto& it : this->ProjectMap) { + this->OutputSLNFile(it.second[0], it.second); + } + // If any solution or project files changed during the generation, // tell Visual Studio to reload them... if (!cmSystemTools::GetErrorOccurredFlag() && @@ -340,14 +343,6 @@ void cmGlobalVisualStudio7Generator::OutputSLNFile( } } -// output the SLN file -void cmGlobalVisualStudio7Generator::OutputSLNFile() -{ - for (auto& it : this->ProjectMap) { - this->OutputSLNFile(it.second[0], it.second); - } -} - void cmGlobalVisualStudio7Generator::WriteTargetConfigurations( std::ostream& fout, std::vector const& configs, OrderedTargetDependSet const& projectTargets) const diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index f35f6c6b60..a63bc4c254 100644 --- a/Source/cmGlobalVisualStudio7Generator.h +++ b/Source/cmGlobalVisualStudio7Generator.h @@ -82,11 +82,6 @@ public: std::vector const& makeOptions = std::vector()) override; - /** - * Generate the VS Solution file. - */ - virtual void OutputSLNFile(); - //! Lookup a stored GUID or compute one deterministically. std::string GetGUID(std::string const& name) const;