diff options
author | Brad King <brad.king@kitware.com> | 2019-01-09 16:50:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-01-10 12:52:49 (GMT) |
commit | 6d99406e698a3d1b0b69b0fc0f6e09e93fc4ed79 (patch) | |
tree | e6dd4952bee7c38f8ef81b027c66f3f5e0a7de17 | |
parent | 03f74a16cde9e2e7e3433054970cc7cadd31388f (diff) | |
download | CMake-6d99406e698a3d1b0b69b0fc0f6e09e93fc4ed79.zip CMake-6d99406e698a3d1b0b69b0fc0f6e09e93fc4ed79.tar.gz CMake-6d99406e698a3d1b0b69b0fc0f6e09e93fc4ed79.tar.bz2 |
VS: Move ExpressEdition member to top-level generator
We no longer support any VS versions that pre-date introduction of
express editions.
-rw-r--r-- | Source/cmGlobalVisualStudio8Generator.h | 4 | ||||
-rw-r--r-- | 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; |