From d52eb1d0839a41207969deb9be27953c5f43a5f9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 15 Sep 2025 14:09:46 -0400 Subject: [PATCH] cmGlobalVisualStudioGenerator: Remove unused folder support rules Folders are supported on all versions of VS for which we still have generators. --- Source/cmGlobalVisualStudio11Generator.cxx | 9 --------- Source/cmGlobalVisualStudio11Generator.h | 1 - Source/cmGlobalVisualStudio71Generator.h | 3 --- Source/cmGlobalVisualStudio8Generator.cxx | 6 ------ Source/cmGlobalVisualStudio8Generator.h | 2 -- 5 files changed, 21 deletions(-) diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index b961ae5875..89c4fe6d7e 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -103,15 +103,6 @@ bool cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset( toolset); } -bool cmGlobalVisualStudio11Generator::UseFolderProperty() const -{ - // Intentionally skip up to the top-level class implementation. - // Folders are not supported by the Express editions in VS10 and earlier, - // but they are in VS11 Express and above. - // NOLINTNEXTLINE(bugprone-parent-virtual-call) - return cmGlobalGenerator::UseFolderProperty(); -} - std::set cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs() { diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h index 4b00fa26a5..fe348fb846 100644 --- a/Source/cmGlobalVisualStudio11Generator.h +++ b/Source/cmGlobalVisualStudio11Generator.h @@ -47,7 +47,6 @@ protected: bool IsWindowsPhoneToolsetInstalled() const; bool IsWindowsStoreToolsetInstalled() const; - bool UseFolderProperty() const override; static std::set GetInstalledWindowsCESDKs(); /** Return true if target system supports debugging deployment. */ diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h index 70fa64cba2..f92ad272a0 100644 --- a/Source/cmGlobalVisualStudio71Generator.h +++ b/Source/cmGlobalVisualStudio71Generator.h @@ -46,8 +46,5 @@ protected: cmValue typeGuid, std::set>> const& depends) const override; - // Folders are not supported by VS 7.1. - bool UseFolderProperty() const override { return false; } - std::string ProjectConfigurationSectionName; }; diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 5642a03d56..9e2b303847 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -218,12 +218,6 @@ std::string cmGlobalVisualStudio8Generator::GetGenerateStampList() return "generate.stamp.list"; } -bool cmGlobalVisualStudio8Generator::UseFolderProperty() const -{ - // NOLINTNEXTLINE(bugprone-parent-virtual-call) - return IsExpressEdition() ? false : cmGlobalGenerator::UseFolderProperty(); -} - bool cmGlobalVisualStudio8Generator::AddCheckTarget() { // Add a special target on which all other targets depend that diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h index 85e6ceb679..0bbf1a40e7 100644 --- a/Source/cmGlobalVisualStudio8Generator.h +++ b/Source/cmGlobalVisualStudio8Generator.h @@ -84,8 +84,6 @@ protected: std::string const& path, cmGeneratorTarget const* t) const override; - bool UseFolderProperty() const override; - std::string Name; std::string WindowsCEVersion;