diff options
Diffstat (limited to 'Source/cmGlobalVisualStudio11Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio11Generator.cxx | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 086d3af..3ad10eb 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -7,7 +7,6 @@ #include <utility> #include <vector> -#include "cmDocumentationEntry.h" #include "cmGlobalGenerator.h" #include "cmGlobalGeneratorFactory.h" #include "cmGlobalVisualStudioGenerator.h" @@ -23,7 +22,7 @@ static const char* cmVS11GenName(const std::string& name, std::string& genName) { if (strncmp(name.c_str(), vs11generatorName, sizeof(vs11generatorName) - 6) != 0) { - return 0; + return nullptr; } const char* p = name.c_str() + sizeof(vs11generatorName) - 6; if (cmHasLiteralPrefix(p, " 2012")) { @@ -74,11 +73,11 @@ public: return std::unique_ptr<cmGlobalGenerator>(std::move(ret)); } - void GetDocumentation(cmDocumentationEntry& entry) const override + cmDocumentationEntry GetDocumentation() const override { - entry.Name = std::string(vs11generatorName) + " [arch]"; - entry.Brief = "Deprecated. Generates Visual Studio 2012 project files. " - "Optional [arch] can be \"Win64\" or \"ARM\"."; + return { std::string(vs11generatorName) + " [arch]", + "Deprecated. Generates Visual Studio 2012 project files. " + "Optional [arch] can be \"Win64\" or \"ARM\"." }; } std::vector<std::string> GetGeneratorNames() const override @@ -161,6 +160,18 @@ bool cmGlobalVisualStudio11Generator::MatchesGeneratorName( return false; } +void cmGlobalVisualStudio11Generator::EnableLanguage( + std::vector<std::string> const& lang, cmMakefile* mf, bool optional) +{ + for (std::string const& it : lang) { + if (it == "ASM_MARMASM") { + this->MarmasmEnabled = true; + } + } + this->AddPlatformDefinitions(mf); + cmGlobalVisualStudio10Generator::EnableLanguage(lang, mf, optional); +} + bool cmGlobalVisualStudio11Generator::InitializeWindowsPhone(cmMakefile* mf) { if (!this->SelectWindowsPhoneToolset(this->DefaultPlatformToolset)) { @@ -205,9 +216,8 @@ bool cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset( this->IsWindowsDesktopToolsetInstalled()) { toolset = "v110_wp80"; return true; - } else { - return false; } + return false; } return this->cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset( toolset); @@ -221,9 +231,8 @@ bool cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset( this->IsWindowsDesktopToolsetInstalled()) { toolset = "v110"; return true; - } else { - return false; } + return false; } return this->cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset( toolset); @@ -234,6 +243,7 @@ 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(); } |