summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio14Generator.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmGlobalVisualStudio14Generator.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-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/cmGlobalVisualStudio14Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio14Generator.cxx197
1 files changed, 84 insertions, 113 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 8f93e17..e190e84 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -20,16 +20,14 @@ static const char vs14generatorName[] = "Visual Studio 14 2015";
// Map generator name without year to name with year.
static const char* cmVS14GenName(const std::string& name, std::string& genName)
{
- if(strncmp(name.c_str(), vs14generatorName,
- sizeof(vs14generatorName)-6) != 0)
- {
+ if (strncmp(name.c_str(), vs14generatorName,
+ sizeof(vs14generatorName) - 6) != 0) {
return 0;
- }
+ }
const char* p = name.c_str() + sizeof(vs14generatorName) - 6;
- if(cmHasLiteralPrefix(p, " 2015"))
- {
+ if (cmHasLiteralPrefix(p, " 2015")) {
p += 5;
- }
+ }
genName = std::string(vs14generatorName) + p;
return p;
}
@@ -38,45 +36,42 @@ class cmGlobalVisualStudio14Generator::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 = cmVS14GenName(name, genName);
- if(!p)
- { return 0; }
- if(!*p)
- {
+ if (!p) {
+ return 0;
+ }
+ if (!*p) {
return new cmGlobalVisualStudio14Generator(cm, genName, "");
- }
- if(*p++ != ' ')
- { return 0; }
- if(strcmp(p, "Win64") == 0)
- {
+ }
+ if (*p++ != ' ') {
+ return 0;
+ }
+ if (strcmp(p, "Win64") == 0) {
return new cmGlobalVisualStudio14Generator(cm, genName, "x64");
- }
- if(strcmp(p, "ARM") == 0)
- {
+ }
+ if (strcmp(p, "ARM") == 0) {
return new cmGlobalVisualStudio14Generator(cm, genName, "ARM");
- }
- return 0;
}
+ return 0;
+ }
virtual void GetDocumentation(cmDocumentationEntry& entry) const
- {
+ {
entry.Name = std::string(vs14generatorName) + " [arch]";
- entry.Brief =
- "Generates Visual Studio 2015 project files. "
- "Optional [arch] can be \"Win64\" or \"ARM\"."
- ;
- }
+ entry.Brief = "Generates Visual Studio 2015 project files. "
+ "Optional [arch] can be \"Win64\" or \"ARM\".";
+ }
virtual void GetGenerators(std::vector<std::string>& names) const
- {
+ {
names.push_back(vs14generatorName);
names.push_back(vs14generatorName + std::string(" ARM"));
names.push_back(vs14generatorName + std::string(" Win64"));
- }
+ }
virtual bool SupportsToolset() const { return true; }
};
@@ -86,63 +81,56 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory()
return new Factory;
}
-cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator(cmake* cm,
- const std::string& name, const std::string& platformName)
+cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator(
+ cmake* cm, const std::string& name, const std::string& platformName)
: cmGlobalVisualStudio12Generator(cm, name, platformName)
{
std::string vc14Express;
this->ExpressEdition = cmSystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\14.0\\Setup\\VC;"
- "ProductDir", vc14Express, cmSystemTools::KeyWOW64_32);
+ "ProductDir",
+ vc14Express, cmSystemTools::KeyWOW64_32);
this->DefaultPlatformToolset = "v140";
this->Version = VS14;
}
-bool
-cmGlobalVisualStudio14Generator::MatchesGeneratorName(
- const std::string& name) const
+bool cmGlobalVisualStudio14Generator::MatchesGeneratorName(
+ const std::string& name) const
{
std::string genName;
- if(cmVS14GenName(name, genName))
- {
+ if (cmVS14GenName(name, genName)) {
return genName == this->GetName();
- }
+ }
return false;
}
bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf)
{
- if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
- {
+ if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) {
return this->SelectWindows10SDK(mf, false);
- }
+ }
return true;
}
bool cmGlobalVisualStudio14Generator::InitializeWindowsStore(cmMakefile* mf)
{
- std::ostringstream e;
- if(!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset))
- {
- if(this->DefaultPlatformToolset.empty())
- {
+ std::ostringstream e;
+ if (!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset)) {
+ if (this->DefaultPlatformToolset.empty()) {
e << this->GetName() << " supports Windows Store '8.0', '8.1' and "
- "'10.0', but not '" << this->SystemVersion <<
- "'. Check CMAKE_SYSTEM_VERSION.";
- }
- else
- {
+ "'10.0', but 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;
- }
- if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
- {
+ }
+ if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) {
return this->SelectWindows10SDK(mf, true);
- }
+ }
return true;
}
@@ -151,85 +139,73 @@ bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf,
{
// Find the default version of the Windows 10 SDK.
this->WindowsTargetPlatformVersion = this->GetWindows10SDKVersion();
- if (required && this->WindowsTargetPlatformVersion.empty())
- {
- std::ostringstream e;
+ if (required && this->WindowsTargetPlatformVersion.empty()) {
+ std::ostringstream e;
e << "Could not find an appropriate version of the Windows 10 SDK"
<< " installed on this machine";
mf->IssueMessage(cmake::FATAL_ERROR, e.str());
return false;
- }
+ }
mf->AddDefinition("CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION",
this->WindowsTargetPlatformVersion.c_str());
return true;
}
-bool
-cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset(
+bool cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset(
std::string& toolset) const
{
- if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
- {
+ if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) {
if (this->IsWindowsStoreToolsetInstalled() &&
- this->IsWindowsDesktopToolsetInstalled())
- {
+ this->IsWindowsDesktopToolsetInstalled()) {
toolset = "v140";
return true;
- }
- else
- {
+ } else {
return false;
- }
}
- return
- this->cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset(toolset);
+ }
+ return this->cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset(
+ toolset);
}
void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout)
{
// Visual Studio 14 writes .sln format 12.00
fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
- if (this->ExpressEdition)
- {
+ if (this->ExpressEdition) {
fout << "# Visual Studio Express 14 for Windows Desktop\n";
- }
- else
- {
+ } else {
fout << "# Visual Studio 14\n";
- }
+ }
}
-bool
-cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const
+bool cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const
{
- const char desktop10Key[] =
- "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
- "VisualStudio\\14.0\\VC\\Runtimes";
+ const char desktop10Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+ "VisualStudio\\14.0\\VC\\Runtimes";
std::vector<std::string> vc14;
- return cmSystemTools::GetRegistrySubKeys(desktop10Key,
- vc14, cmSystemTools::KeyWOW64_32);
+ return cmSystemTools::GetRegistrySubKeys(desktop10Key, vc14,
+ cmSystemTools::KeyWOW64_32);
}
-bool
-cmGlobalVisualStudio14Generator::IsWindowsStoreToolsetInstalled() const
+bool cmGlobalVisualStudio14Generator::IsWindowsStoreToolsetInstalled() const
{
const char universal10Key[] =
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
"VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;SrcPath";
std::string win10SDK;
- return cmSystemTools::ReadRegistryValue(universal10Key,
- win10SDK, cmSystemTools::KeyWOW64_32);
+ return cmSystemTools::ReadRegistryValue(universal10Key, win10SDK,
+ cmSystemTools::KeyWOW64_32);
}
#if defined(_WIN32) && !defined(__CYGWIN__)
struct NoWindowsH
{
bool operator()(std::string const& p)
- {
+ {
return !cmSystemTools::FileExists(p + "/um/windows.h", true);
- }
+ }
};
#endif
@@ -241,15 +217,14 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
std::string win10Root;
if (!cmSystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
- "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
- cmSystemTools::KeyWOW64_32) &&
+ "Windows Kits\\Installed Roots;KitsRoot10",
+ win10Root, cmSystemTools::KeyWOW64_32) &&
!cmSystemTools::ReadRegistryValue(
"HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
- "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
- cmSystemTools::KeyWOW64_32))
- {
+ "Windows Kits\\Installed Roots;KitsRoot10",
+ win10Root, cmSystemTools::KeyWOW64_32)) {
return std::string();
- }
+ }
std::vector<std::string> sdks;
std::string path = win10Root + "Include/*";
@@ -261,31 +236,27 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
sdks.erase(std::remove_if(sdks.begin(), sdks.end(), NoWindowsH()),
sdks.end());
- if (!sdks.empty())
- {
+ if (!sdks.empty()) {
// Only use the filename, which will be the SDK version.
- for (std::vector<std::string>::iterator i = sdks.begin();
- i != sdks.end(); ++i)
- {
+ for (std::vector<std::string>::iterator i = sdks.begin(); i != sdks.end();
+ ++i) {
*i = cmSystemTools::GetFilenameName(*i);
- }
+ }
// Sort the results to make sure we select the most recent one.
std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
// Look for a SDK exactly matching the requested target version.
- for (std::vector<std::string>::iterator i = sdks.begin();
- i != sdks.end(); ++i)
- {
- if (cmSystemTools::VersionCompareEqual(*i, this->SystemVersion))
- {
+ for (std::vector<std::string>::iterator i = sdks.begin(); i != sdks.end();
+ ++i) {
+ if (cmSystemTools::VersionCompareEqual(*i, this->SystemVersion)) {
return *i;
- }
}
+ }
// Use the latest Windows 10 SDK since the exact version is not available.
return sdks.at(0);
- }
+ }
#endif
// Return an empty string
return std::string();