From 772cf917c1bb2c895c8a066a2d94b110ce465f79 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 16 Sep 2025 11:02:45 -0400 Subject: [PATCH] cmGlobalVisualStudio71Generator: Remove this now-unnecessary class It no longer contains anything not in `cmGlobalVisualStudio7Generator`. --- Source/CMakeLists.txt | 2 -- Source/cmGlobalVisualStudio10Generator.cxx | 3 +-- Source/cmGlobalVisualStudio71Generator.cxx | 10 ---------- Source/cmGlobalVisualStudio71Generator.h | 13 ------------- Source/cmGlobalVisualStudio8Generator.cxx | 4 ++-- Source/cmGlobalVisualStudio8Generator.h | 4 ++-- 6 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 Source/cmGlobalVisualStudio71Generator.cxx delete mode 100644 Source/cmGlobalVisualStudio71Generator.h diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index f9066b3bed..217306b1d8 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -935,8 +935,6 @@ if(WIN32) cmGlobalNMakeMakefileGenerator.h cmGlobalJOMMakefileGenerator.cxx cmGlobalJOMMakefileGenerator.h - cmGlobalVisualStudio71Generator.cxx - cmGlobalVisualStudio71Generator.h cmGlobalVisualStudio7Generator.cxx cmGlobalVisualStudio7Generator.h cmGlobalVisualStudio8Generator.cxx diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 15989569c9..cefb6807e9 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -23,7 +23,6 @@ #include "cmExperimental.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" -#include "cmGlobalVisualStudio71Generator.h" #include "cmGlobalVisualStudio7Generator.h" #include "cmGlobalVisualStudioGenerator.h" #include "cmIDEFlagTable.h" @@ -861,7 +860,7 @@ std::string cmGlobalVisualStudio10Generator::FindDevEnvCommand() // Skip over the cmGlobalVisualStudio8Generator implementation because // we expect a real devenv and do not want to look for VCExpress. // NOLINTNEXTLINE(bugprone-parent-virtual-call) - return this->cmGlobalVisualStudio71Generator::FindDevEnvCommand(); + return this->cmGlobalVisualStudio7Generator::FindDevEnvCommand(); } bool cmGlobalVisualStudio10Generator::FindVCTargetsPath(cmMakefile* mf) diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx deleted file mode 100644 index 59f3233346..0000000000 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ /dev/null @@ -1,10 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file LICENSE.rst or https://cmake.org/licensing for details. */ -#include "cmGlobalVisualStudio71Generator.h" - -class cmake; - -cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(cmake* cm) - : cmGlobalVisualStudio7Generator(cm) -{ -} diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h deleted file mode 100644 index 97a151786c..0000000000 --- a/Source/cmGlobalVisualStudio71Generator.h +++ /dev/null @@ -1,13 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file LICENSE.rst or https://cmake.org/licensing for details. */ -#pragma once - -#include "cmGlobalVisualStudio7Generator.h" - -class cmake; - -class cmGlobalVisualStudio71Generator : public cmGlobalVisualStudio7Generator -{ -public: - cmGlobalVisualStudio71Generator(cmake* cm); -}; diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 022ca95174..2c5f1f69b3 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -40,7 +40,7 @@ struct cmIDEFlagTable; cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator( cmake* cm, std::string const& name) - : cmGlobalVisualStudio71Generator(cm) + : cmGlobalVisualStudio7Generator(cm) { this->Name = name; this->ExtraFlagTable = @@ -61,7 +61,7 @@ std::string cmGlobalVisualStudio8Generator::FindDevEnvCommand() return vsxcmd; } // Now look for devenv. - return this->cmGlobalVisualStudio71Generator::FindDevEnvCommand(); + return this->cmGlobalVisualStudio7Generator::FindDevEnvCommand(); } void cmGlobalVisualStudio8Generator::EnableLanguage( diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h index 68278c4169..dccbc36280 100644 --- a/Source/cmGlobalVisualStudio8Generator.h +++ b/Source/cmGlobalVisualStudio8Generator.h @@ -9,7 +9,7 @@ #include -#include "cmGlobalVisualStudio71Generator.h" +#include "cmGlobalVisualStudio7Generator.h" class cmGeneratorTarget; class cmMakefile; @@ -21,7 +21,7 @@ struct cmIDEFlagTable; * * cmGlobalVisualStudio8Generator manages UNIX build process for a tree */ -class cmGlobalVisualStudio8Generator : public cmGlobalVisualStudio71Generator +class cmGlobalVisualStudio8Generator : public cmGlobalVisualStudio7Generator { public: //! Get the name for the generator.