diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGlobalVisualStudio11Generator.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
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/cmGlobalVisualStudio11Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio11Generator.cxx | 232 |
1 files changed, 93 insertions, 139 deletions
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 1a17c6f..295b6eb 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -20,16 +20,14 @@ static const char vs11generatorName[] = "Visual Studio 11 2012"; // Map generator name without year to name with year. static const char* cmVS11GenName(const std::string& name, std::string& genName) { - if(strncmp(name.c_str(), vs11generatorName, - sizeof(vs11generatorName)-6) != 0) - { + if (strncmp(name.c_str(), vs11generatorName, + sizeof(vs11generatorName) - 6) != 0) { return 0; - } + } const char* p = name.c_str() + sizeof(vs11generatorName) - 6; - if(cmHasLiteralPrefix(p, " 2012")) - { + if (cmHasLiteralPrefix(p, " 2012")) { p += 5; - } + } genName = std::string(vs11generatorName) + p; return p; } @@ -38,65 +36,60 @@ class cmGlobalVisualStudio11Generator::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 = cmVS11GenName(name, genName); - if(!p) - { return 0; } - if(!*p) - { + if (!p) { + return 0; + } + if (!*p) { return new cmGlobalVisualStudio11Generator(cm, genName, ""); - } - if(*p++ != ' ') - { return 0; } - if(strcmp(p, "Win64") == 0) - { + } + if (*p++ != ' ') { + return 0; + } + if (strcmp(p, "Win64") == 0) { return new cmGlobalVisualStudio11Generator(cm, genName, "x64"); - } - if(strcmp(p, "ARM") == 0) - { + } + if (strcmp(p, "ARM") == 0) { return new cmGlobalVisualStudio11Generator(cm, genName, "ARM"); - } + } std::set<std::string> installedSDKs = cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs(); - if(installedSDKs.find(p) == installedSDKs.end()) - { + if (installedSDKs.find(p) == installedSDKs.end()) { return 0; - } + } cmGlobalVisualStudio11Generator* ret = new cmGlobalVisualStudio11Generator(cm, name, p); ret->WindowsCEVersion = "8.00"; return ret; - } + } virtual void GetDocumentation(cmDocumentationEntry& entry) const - { + { entry.Name = std::string(vs11generatorName) + " [arch]"; - entry.Brief = - "Generates Visual Studio 2012 project files. " - "Optional [arch] can be \"Win64\" or \"ARM\"." - ; - } + entry.Brief = "Generates Visual Studio 2012 project files. " + "Optional [arch] can be \"Win64\" or \"ARM\"."; + } virtual void GetGenerators(std::vector<std::string>& names) const - { + { names.push_back(vs11generatorName); names.push_back(vs11generatorName + std::string(" ARM")); names.push_back(vs11generatorName + std::string(" Win64")); std::set<std::string> installedSDKs = cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs(); - for(std::set<std::string>::const_iterator i = - installedSDKs.begin(); i != installedSDKs.end(); ++i) - { + for (std::set<std::string>::const_iterator i = installedSDKs.begin(); + i != installedSDKs.end(); ++i) { names.push_back(std::string(vs11generatorName) + " " + *i); - } } + } virtual bool SupportsToolset() const { return true; } }; @@ -106,127 +99,105 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory() return new Factory; } -cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator(cmake* cm, - const std::string& name, const std::string& platformName) +cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator( + cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio10Generator(cm, name, platformName) { std::string vc11Express; this->ExpressEdition = cmSystemTools::ReadRegistryValue( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\11.0\\Setup\\VC;" - "ProductDir", vc11Express, cmSystemTools::KeyWOW64_32); + "ProductDir", + vc11Express, cmSystemTools::KeyWOW64_32); this->DefaultPlatformToolset = "v110"; this->Version = VS11; } -bool -cmGlobalVisualStudio11Generator::MatchesGeneratorName( - const std::string& name) const +bool cmGlobalVisualStudio11Generator::MatchesGeneratorName( + const std::string& name) const { std::string genName; - if(cmVS11GenName(name, genName)) - { + if (cmVS11GenName(name, genName)) { return genName == this->GetName(); - } + } return false; } bool cmGlobalVisualStudio11Generator::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', but not '" << this->SystemVersion << "'. Check CMAKE_SYSTEM_VERSION."; - } - else - { + } 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 cmGlobalVisualStudio11Generator::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', but not '" << this->SystemVersion << "'. Check CMAKE_SYSTEM_VERSION."; - } - else - { + } 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 -cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset( +bool cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset( std::string& toolset) const { - if(this->SystemVersion == "8.0") - { + if (this->SystemVersion == "8.0") { if (this->IsWindowsPhoneToolsetInstalled() && - this->IsWindowsDesktopToolsetInstalled()) - { + this->IsWindowsDesktopToolsetInstalled()) { toolset = "v110_wp80"; return true; - } - else - { + } else { return false; - } } - return - this->cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset(toolset); + } + return this->cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset( + toolset); } -bool -cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset( +bool cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset( std::string& toolset) const { - if(this->SystemVersion == "8.0") - { - if(this->IsWindowsStoreToolsetInstalled() && - this->IsWindowsDesktopToolsetInstalled()) - { + if (this->SystemVersion == "8.0") { + if (this->IsWindowsStoreToolsetInstalled() && + this->IsWindowsDesktopToolsetInstalled()) { toolset = "v110"; return true; - } - else - { + } else { return false; - } } - return - this->cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset(toolset); + } + return this->cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset( + toolset); } void cmGlobalVisualStudio11Generator::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 2012 for Windows Desktop\n"; - } - else - { + } else { fout << "# Visual Studio 2012\n"; - } + } } bool cmGlobalVisualStudio11Generator::UseFolderProperty() @@ -248,84 +219,67 @@ cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs() cmSystemTools::KeyWOW64_32); std::set<std::string> ret; - for(std::vector<std::string>::const_iterator i = - subkeys.begin(); i != subkeys.end(); ++i) - { + for (std::vector<std::string>::const_iterator i = subkeys.begin(); + i != subkeys.end(); ++i) { std::string key = sdksKey; key += '\\'; key += *i; key += ';'; std::string path; - if(cmSystemTools::ReadRegistryValue(key.c_str(), - path, - cmSystemTools::KeyWOW64_32) && - !path.empty()) - { + if (cmSystemTools::ReadRegistryValue(key.c_str(), path, + cmSystemTools::KeyWOW64_32) && + !path.empty()) { ret.insert(*i); - } } + } return ret; } -bool -cmGlobalVisualStudio11Generator::NeedsDeploy(cmState::TargetType type) const +bool cmGlobalVisualStudio11Generator::NeedsDeploy( + cmState::TargetType type) const { - if((type == cmState::EXECUTABLE || - type == cmState::SHARED_LIBRARY) && - (this->SystemIsWindowsPhone || - this->SystemIsWindowsStore)) - { + if ((type == cmState::EXECUTABLE || type == cmState::SHARED_LIBRARY) && + (this->SystemIsWindowsPhone || this->SystemIsWindowsStore)) { return true; - } + } return cmGlobalVisualStudio10Generator::NeedsDeploy(type); } -bool -cmGlobalVisualStudio11Generator::IsWindowsDesktopToolsetInstalled() const +bool cmGlobalVisualStudio11Generator::IsWindowsDesktopToolsetInstalled() const { - const char desktop80Key[] = - "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" - "VisualStudio\\11.0\\VC\\Libraries\\Extended"; + const char desktop80Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" + "VisualStudio\\11.0\\VC\\Libraries\\Extended"; const char VS2012DesktopExpressKey[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" "WDExpress\\11.0;InstallDir"; std::vector<std::string> subkeys; std::string path; - return cmSystemTools::ReadRegistryValue(VS2012DesktopExpressKey, - path, + return cmSystemTools::ReadRegistryValue(VS2012DesktopExpressKey, path, cmSystemTools::KeyWOW64_32) || - cmSystemTools::GetRegistrySubKeys(desktop80Key, - subkeys, - cmSystemTools::KeyWOW64_32); + cmSystemTools::GetRegistrySubKeys(desktop80Key, subkeys, + cmSystemTools::KeyWOW64_32); } -bool -cmGlobalVisualStudio11Generator::IsWindowsPhoneToolsetInstalled() const +bool cmGlobalVisualStudio11Generator::IsWindowsPhoneToolsetInstalled() const { - const char wp80Key[] = - "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" - "Microsoft SDKs\\WindowsPhone\\v8.0\\" - "Install Path;Install Path"; + const char wp80Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" + "Microsoft SDKs\\WindowsPhone\\v8.0\\" + "Install Path;Install Path"; std::string path; - cmSystemTools::ReadRegistryValue(wp80Key, - path, - cmSystemTools::KeyWOW64_32); + cmSystemTools::ReadRegistryValue(wp80Key, path, cmSystemTools::KeyWOW64_32); return !path.empty(); } -bool -cmGlobalVisualStudio11Generator::IsWindowsStoreToolsetInstalled() const +bool cmGlobalVisualStudio11Generator::IsWindowsStoreToolsetInstalled() const { - const char win80Key[] = - "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" - "VisualStudio\\11.0\\VC\\Libraries\\Core\\Arm"; + const char win80Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" + "VisualStudio\\11.0\\VC\\Libraries\\Core\\Arm"; std::vector<std::string> subkeys; - return cmSystemTools::GetRegistrySubKeys(win80Key, - subkeys, + return cmSystemTools::GetRegistrySubKeys(win80Key, subkeys, cmSystemTools::KeyWOW64_32); } |