summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio9Generator.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/cmGlobalVisualStudio9Generator.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/cmGlobalVisualStudio9Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio9Generator.cxx86
1 files changed, 40 insertions, 46 deletions
diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx
index 6052856..a47f4fc 100644
--- a/Source/cmGlobalVisualStudio9Generator.cxx
+++ b/Source/cmGlobalVisualStudio9Generator.cxx
@@ -20,63 +20,57 @@
static const char vs9generatorName[] = "Visual Studio 9 2008";
-class cmGlobalVisualStudio9Generator::Factory
- : public cmGlobalGeneratorFactory
+class cmGlobalVisualStudio9Generator::Factory : public cmGlobalGeneratorFactory
{
public:
- virtual cmGlobalGenerator*
- CreateGlobalGenerator(const std::string& name, cmake* cm) const {
- if(strncmp(name.c_str(), vs9generatorName,
- sizeof(vs9generatorName) - 1) != 0)
- {
+ virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
+ cmake* cm) const
+ {
+ if (strncmp(name.c_str(), vs9generatorName,
+ sizeof(vs9generatorName) - 1) != 0) {
return 0;
- }
+ }
const char* p = name.c_str() + sizeof(vs9generatorName) - 1;
- if(p[0] == '\0')
- {
+ if (p[0] == '\0') {
return new cmGlobalVisualStudio9Generator(cm, name, "");
- }
+ }
- if(p[0] != ' ')
- {
+ if (p[0] != ' ') {
return 0;
- }
+ }
++p;
- if(!strcmp(p, "IA64"))
- {
+ if (!strcmp(p, "IA64")) {
return new cmGlobalVisualStudio9Generator(cm, name, "Itanium");
- }
+ }
- if(!strcmp(p, "Win64"))
- {
+ if (!strcmp(p, "Win64")) {
return new cmGlobalVisualStudio9Generator(cm, name, "x64");
- }
+ }
cmVisualStudioWCEPlatformParser parser(p);
parser.ParseVersion("9.0");
- if (!parser.Found())
- {
+ if (!parser.Found()) {
return 0;
- }
+ }
cmGlobalVisualStudio9Generator* ret =
- new cmGlobalVisualStudio9Generator(cm, name, p);
+ new cmGlobalVisualStudio9Generator(cm, name, p);
ret->WindowsCEVersion = parser.GetOSVersion();
return ret;
}
- virtual void GetDocumentation(cmDocumentationEntry& entry) const {
+ virtual void GetDocumentation(cmDocumentationEntry& entry) const
+ {
entry.Name = std::string(vs9generatorName) + " [arch]";
- entry.Brief =
- "Generates Visual Studio 2008 project files. "
- "Optional [arch] can be \"Win64\" or \"IA64\"."
- ;
+ entry.Brief = "Generates Visual Studio 2008 project files. "
+ "Optional [arch] can be \"Win64\" or \"IA64\".";
}
- virtual void GetGenerators(std::vector<std::string>& names) const {
+ virtual void GetGenerators(std::vector<std::string>& names) const
+ {
names.push_back(vs9generatorName);
names.push_back(vs9generatorName + std::string(" Win64"));
names.push_back(vs9generatorName + std::string(" IA64"));
@@ -84,11 +78,11 @@ public:
parser.ParseVersion("9.0");
const std::vector<std::string>& availablePlatforms =
parser.GetAvailablePlatforms();
- for(std::vector<std::string>::const_iterator i =
- availablePlatforms.begin(); i != availablePlatforms.end(); ++i)
- {
+ for (std::vector<std::string>::const_iterator i =
+ availablePlatforms.begin();
+ i != availablePlatforms.end(); ++i) {
names.push_back("Visual Studio 9 2008 " + *i);
- }
+ }
}
virtual bool SupportsToolset() const { return false; }
@@ -99,15 +93,16 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio9Generator::NewFactory()
return new Factory;
}
-cmGlobalVisualStudio9Generator::cmGlobalVisualStudio9Generator(cmake* cm,
- const std::string& name, const std::string& platformName)
+cmGlobalVisualStudio9Generator::cmGlobalVisualStudio9Generator(
+ cmake* cm, const std::string& name, const std::string& platformName)
: cmGlobalVisualStudio8Generator(cm, name, platformName)
{
this->Version = VS9;
std::string vc9Express;
this->ExpressEdition = cmSystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0\\Setup\\VC;"
- "ProductDir", vc9Express, cmSystemTools::KeyWOW64_32);
+ "ProductDir",
+ vc9Express, cmSystemTools::KeyWOW64_32);
}
void cmGlobalVisualStudio9Generator::WriteSLNHeader(std::ostream& fout)
@@ -123,19 +118,18 @@ std::string cmGlobalVisualStudio9Generator::GetUserMacrosDirectory()
// base begins with the VisualStudioProjectsLocation reg value...
if (cmSystemTools::ReadRegistryValue(
- "HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\9.0;"
- "VisualStudioProjectsLocation",
- base))
- {
+ "HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\9.0;"
+ "VisualStudioProjectsLocation",
+ base)) {
cmSystemTools::ConvertToUnixSlashes(base);
// 9.0 macros folder:
path = base + "/VSMacros80";
- // *NOT* a typo; right now in Visual Studio 2008 beta the macros
- // folder is VSMacros80... They may change it to 90 before final
- // release of 2008 or they may not... we'll have to keep our eyes
- // on it
- }
+ // *NOT* a typo; right now in Visual Studio 2008 beta the macros
+ // folder is VSMacros80... They may change it to 90 before final
+ // release of 2008 or they may not... we'll have to keep our eyes
+ // on it
+ }
// path is (correctly) still empty if we did not read the base value from
// the Registry value