diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 10:34:04 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:05:19 -0400 |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGlobalVisualStudio12Generator.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | cmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmGlobalVisualStudio12Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio12Generator.cxx | 188 |
1 files changed, 77 insertions, 111 deletions
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index 10308a303c..318cb39184 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -20,16 +20,14 @@ static const char vs12generatorName[] = "Visual Studio 12 2013"; // Map generator name without year to name with year. static const char* cmVS12GenName(const std::string& name, std::string& genName) { - if(strncmp(name.c_str(), vs12generatorName, - sizeof(vs12generatorName)-6) != 0) - { + if (strncmp(name.c_str(), vs12generatorName, + sizeof(vs12generatorName) - 6) != 0) { return 0; - } + } const char* p = name.c_str() + sizeof(vs12generatorName) - 6; - if(cmHasLiteralPrefix(p, " 2013")) - { + if (cmHasLiteralPrefix(p, " 2013")) { p += 5; - } + } genName = std::string(vs12generatorName) + p; return p; } @@ -38,45 +36,42 @@ class cmGlobalVisualStudio12Generator::Factory : public cmGlobalGeneratorFactory { public: - virtual cmGlobalGenerator* - CreateGlobalGenerator(const std::string& name, cmake* cm) const - { + virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, + cmake* cm) const + { std::string genName; const char* p = cmVS12GenName(name, genName); - if(!p) - { return 0; } - if(!*p) - { + if (!p) { + return 0; + } + if (!*p) { return new cmGlobalVisualStudio12Generator(cm, genName, ""); - } - if(*p++ != ' ') - { return 0; } - if(strcmp(p, "Win64") == 0) - { + } + if (*p++ != ' ') { + return 0; + } + if (strcmp(p, "Win64") == 0) { return new cmGlobalVisualStudio12Generator(cm, genName, "x64"); - } - if(strcmp(p, "ARM") == 0) - { + } + if (strcmp(p, "ARM") == 0) { return new cmGlobalVisualStudio12Generator(cm, genName, "ARM"); - } - return 0; } + return 0; + } virtual void GetDocumentation(cmDocumentationEntry& entry) const - { + { entry.Name = std::string(vs12generatorName) + " [arch]"; - entry.Brief = - "Generates Visual Studio 2013 project files. " - "Optional [arch] can be \"Win64\" or \"ARM\"." - ; - } + entry.Brief = "Generates Visual Studio 2013 project files. " + "Optional [arch] can be \"Win64\" or \"ARM\"."; + } virtual void GetGenerators(std::vector<std::string>& names) const - { + { names.push_back(vs12generatorName); names.push_back(vs12generatorName + std::string(" ARM")); names.push_back(vs12generatorName + std::string(" Win64")); - } + } virtual bool SupportsToolset() const { return true; } }; @@ -86,165 +81,136 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio12Generator::NewFactory() return new Factory; } -cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator(cmake* cm, - const std::string& name, const std::string& platformName) +cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator( + cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio11Generator(cm, name, platformName) { std::string vc12Express; this->ExpressEdition = cmSystemTools::ReadRegistryValue( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\12.0\\Setup\\VC;" - "ProductDir", vc12Express, cmSystemTools::KeyWOW64_32); + "ProductDir", + vc12Express, cmSystemTools::KeyWOW64_32); this->DefaultPlatformToolset = "v120"; this->Version = VS12; } -bool -cmGlobalVisualStudio12Generator::MatchesGeneratorName( - const std::string& name) const +bool cmGlobalVisualStudio12Generator::MatchesGeneratorName( + const std::string& name) const { std::string genName; - if(cmVS12GenName(name, genName)) - { + if (cmVS12GenName(name, genName)) { return genName == this->GetName(); - } + } return false; } bool cmGlobalVisualStudio12Generator::InitializeWindowsPhone(cmMakefile* mf) { - if(!this->SelectWindowsPhoneToolset(this->DefaultPlatformToolset)) - { + if (!this->SelectWindowsPhoneToolset(this->DefaultPlatformToolset)) { std::ostringstream e; - if(this->DefaultPlatformToolset.empty()) - { + if (this->DefaultPlatformToolset.empty()) { e << this->GetName() << " supports Windows Phone '8.0' and '8.1', but " - "not '" << this->SystemVersion << "'. Check CMAKE_SYSTEM_VERSION."; - } - else - { + "not '" + << this->SystemVersion << "'. Check CMAKE_SYSTEM_VERSION."; + } else { e << "A Windows Phone component with CMake requires both the Windows " << "Desktop SDK as well as the Windows Phone '" << this->SystemVersion << "' SDK. Please make sure that you have both installed"; - } + } mf->IssueMessage(cmake::FATAL_ERROR, e.str()); return false; - } + } return true; } bool cmGlobalVisualStudio12Generator::InitializeWindowsStore(cmMakefile* mf) { - if(!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset)) - { + if (!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset)) { std::ostringstream e; - if(this->DefaultPlatformToolset.empty()) - { + if (this->DefaultPlatformToolset.empty()) { e << this->GetName() << " supports Windows Store '8.0' and '8.1', but " - "not '" << this->SystemVersion << "'. Check CMAKE_SYSTEM_VERSION."; - } - else - { + "not '" + << this->SystemVersion << "'. Check CMAKE_SYSTEM_VERSION."; + } else { e << "A Windows Store component with CMake requires both the Windows " << "Desktop SDK as well as the Windows Store '" << this->SystemVersion << "' SDK. Please make sure that you have both installed"; - } + } mf->IssueMessage(cmake::FATAL_ERROR, e.str()); return false; - } + } return true; } -bool -cmGlobalVisualStudio12Generator::SelectWindowsPhoneToolset( +bool cmGlobalVisualStudio12Generator::SelectWindowsPhoneToolset( std::string& toolset) const { - if(this->SystemVersion == "8.1") - { + if (this->SystemVersion == "8.1") { if (this->IsWindowsPhoneToolsetInstalled() && - this->IsWindowsDesktopToolsetInstalled()) - { + this->IsWindowsDesktopToolsetInstalled()) { toolset = "v120_wp81"; return true; - } - else - { + } else { return false; - } } - return - this->cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset(toolset); + } + return this->cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset( + toolset); } -bool -cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset( +bool cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset( std::string& toolset) const { - if(this->SystemVersion == "8.1") - { - if(this->IsWindowsStoreToolsetInstalled() && - this->IsWindowsDesktopToolsetInstalled()) - { + if (this->SystemVersion == "8.1") { + if (this->IsWindowsStoreToolsetInstalled() && + this->IsWindowsDesktopToolsetInstalled()) { toolset = "v120"; return true; - } - else - { + } else { return false; - } } - return - this->cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset(toolset); + } + return this->cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset( + toolset); } void cmGlobalVisualStudio12Generator::WriteSLNHeader(std::ostream& fout) { fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n"; - if (this->ExpressEdition) - { + if (this->ExpressEdition) { fout << "# Visual Studio Express 2013 for Windows Desktop\n"; - } - else - { + } else { fout << "# Visual Studio 2013\n"; - } + } } -bool -cmGlobalVisualStudio12Generator::IsWindowsDesktopToolsetInstalled() const +bool cmGlobalVisualStudio12Generator::IsWindowsDesktopToolsetInstalled() const { - const char desktop81Key[] = - "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" - "VisualStudio\\12.0\\VC\\LibraryDesktop"; + const char desktop81Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" + "VisualStudio\\12.0\\VC\\LibraryDesktop"; std::vector<std::string> subkeys; - return cmSystemTools::GetRegistrySubKeys(desktop81Key, - subkeys, + return cmSystemTools::GetRegistrySubKeys(desktop81Key, subkeys, cmSystemTools::KeyWOW64_32); } -bool -cmGlobalVisualStudio12Generator::IsWindowsPhoneToolsetInstalled() const +bool cmGlobalVisualStudio12Generator::IsWindowsPhoneToolsetInstalled() const { const char wp81Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" "Microsoft SDKs\\WindowsPhone\\v8.1\\Install Path;Install Path"; std::string path; - cmSystemTools::ReadRegistryValue(wp81Key, - path, - cmSystemTools::KeyWOW64_32); + cmSystemTools::ReadRegistryValue(wp81Key, path, cmSystemTools::KeyWOW64_32); return !path.empty(); } -bool -cmGlobalVisualStudio12Generator::IsWindowsStoreToolsetInstalled() const +bool cmGlobalVisualStudio12Generator::IsWindowsStoreToolsetInstalled() const { - const char win81Key[] = - "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" - "VisualStudio\\12.0\\VC\\Libraries\\Core\\Arm"; + const char win81Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" + "VisualStudio\\12.0\\VC\\Libraries\\Core\\Arm"; std::vector<std::string> subkeys; - return cmSystemTools::GetRegistrySubKeys(win81Key, - subkeys, + return cmSystemTools::GetRegistrySubKeys(win81Key, subkeys, cmSystemTools::KeyWOW64_32); } |