From 6d99406e698a3d1b0b69b0fc0f6e09e93fc4ed79 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 9 Jan 2019 11:50:21 -0500 Subject: VS: Move ExpressEdition member to top-level generator We no longer support any VS versions that pre-date introduction of express editions. --- Source/cmGlobalVisualStudio8Generator.h | 4 ---- Source/cmGlobalVisualStudioGenerator.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h index 0ecf59f..cacfa68 100644 --- a/Source/cmGlobalVisualStudio8Generator.h +++ b/Source/cmGlobalVisualStudio8Generator.h @@ -44,9 +44,6 @@ public: return !this->WindowsCEVersion.empty(); } - /** Is the installed VS an Express edition? */ - bool IsExpressEdition() const { return this->ExpressEdition; } - protected: void AddExtraIDETargets() override; @@ -76,6 +73,5 @@ protected: std::string Name; std::string WindowsCEVersion; - bool ExpressEdition; }; #endif diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index 6779dc8..58c0d90 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -47,6 +47,9 @@ public: VSVersion GetVersion() const; void SetVersion(VSVersion v); + /** Is the installed VS an Express edition? */ + bool IsExpressEdition() const { return this->ExpressEdition; } + /** * Configure CMake's Visual Studio macros file into the user's Visual * Studio macros directory. @@ -159,6 +162,7 @@ protected: protected: VSVersion Version; + bool ExpressEdition; private: virtual std::string GetVSMakeProgram() = 0; -- cgit v0.12