diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-15 13:04:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-15 13:04:24 (GMT) |
| commit | c59ec2b7c8f24de9eceba141ae7b379806c37948 (patch) | |
| tree | 2cbf2ecd508d794b08b3ee7e47e92aa6d7d80dd7 /Source/cmGlobalVisualStudio14Generator.cxx | |
| parent | 0c3fc5a2513ecf2daff2223dc26bcc4dcadf9b09 (diff) | |
| parent | 4db08807db2fc0db6ab0c4d438ddb3f20969d2fb (diff) | |
| download | CMake-c59ec2b7c8f24de9eceba141ae7b379806c37948.zip CMake-c59ec2b7c8f24de9eceba141ae7b379806c37948.tar.gz CMake-c59ec2b7c8f24de9eceba141ae7b379806c37948.tar.bz2 | |
Merge topic 'cmake-internal-info'
4db08807 CMake: Report whether generators support platforms
43a68a6d cmGlobalGeneratorFactory: Use CM_OVERRIDE for all derived classes
af0e1cd4 Make CMake version dirty state available to code
6a077b5d Make CMake version suffix available to code
Diffstat (limited to 'Source/cmGlobalVisualStudio14Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index e190e84..254682c 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -36,8 +36,8 @@ class cmGlobalVisualStudio14Generator::Factory : public cmGlobalGeneratorFactory { public: - virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, - cmake* cm) const + cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, + cmake* cm) const CM_OVERRIDE { std::string genName; const char* p = cmVS14GenName(name, genName); @@ -59,21 +59,22 @@ public: return 0; } - virtual void GetDocumentation(cmDocumentationEntry& entry) const + void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE { entry.Name = std::string(vs14generatorName) + " [arch]"; entry.Brief = "Generates Visual Studio 2015 project files. " "Optional [arch] can be \"Win64\" or \"ARM\"."; } - virtual void GetGenerators(std::vector<std::string>& names) const + void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE { names.push_back(vs14generatorName); names.push_back(vs14generatorName + std::string(" ARM")); names.push_back(vs14generatorName + std::string(" Win64")); } - virtual bool SupportsToolset() const { return true; } + bool SupportsToolset() const CM_OVERRIDE { return true; } + bool SupportsPlatform() const CM_OVERRIDE { return true; } }; cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory() |