summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio10Generator.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/cmLocalVisualStudio10Generator.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/cmLocalVisualStudio10Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio10Generator.cxx105
1 files changed, 44 insertions, 61 deletions
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 4025df4..37b5505 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -19,51 +19,44 @@
class cmVS10XMLParser : public cmXMLParser
{
- public:
- virtual void EndElement(const std::string& /* name */)
- {
- }
+public:
+ virtual void EndElement(const std::string& /* name */) {}
virtual void CharacterDataHandler(const char* data, int length)
- {
- if(this->DoGUID )
- {
- this->GUID.assign(data+1, length-2);
- this->DoGUID = false;
- }
+ {
+ if (this->DoGUID) {
+ this->GUID.assign(data + 1, length - 2);
+ this->DoGUID = false;
}
+ }
virtual void StartElement(const std::string& name, const char**)
- {
- // once the GUID is found do nothing
- if(!this->GUID.empty())
- {
- return;
- }
- if("ProjectGUID" == name || "ProjectGuid" == name)
- {
- this->DoGUID = true;
- }
+ {
+ // once the GUID is found do nothing
+ if (!this->GUID.empty()) {
+ return;
}
+ if ("ProjectGUID" == name || "ProjectGuid" == name) {
+ this->DoGUID = true;
+ }
+ }
int InitializeParser()
- {
- this->DoGUID = false;
- int ret = cmXMLParser::InitializeParser();
- if(ret == 0)
- {
- return ret;
- }
- // visual studio projects have a strange encoding, but it is
- // really utf-8
- XML_SetEncoding(static_cast<XML_Parser>(this->Parser), "utf-8");
- return 1;
+ {
+ this->DoGUID = false;
+ int ret = cmXMLParser::InitializeParser();
+ if (ret == 0) {
+ return ret;
}
+ // visual studio projects have a strange encoding, but it is
+ // really utf-8
+ XML_SetEncoding(static_cast<XML_Parser>(this->Parser), "utf-8");
+ return 1;
+ }
std::string GUID;
bool DoGUID;
};
-
-cmLocalVisualStudio10Generator
-::cmLocalVisualStudio10Generator(cmGlobalGenerator* gg, cmMakefile* mf):
- cmLocalVisualStudio7Generator(gg, mf)
+cmLocalVisualStudio10Generator::cmLocalVisualStudio10Generator(
+ cmGlobalGenerator* gg, cmMakefile* mf)
+ : cmLocalVisualStudio7Generator(gg, mf)
{
}
@@ -75,51 +68,41 @@ void cmLocalVisualStudio10Generator::Generate()
{
std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
- for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
- l != tgts.end(); ++l)
- {
- if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
- {
+ for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+ l != tgts.end(); ++l) {
+ if ((*l)->GetType() == cmState::INTERFACE_LIBRARY) {
continue;
- }
- if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
- ->TargetIsFortranOnly(*l))
- {
+ }
+ if (static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
+ ->TargetIsFortranOnly(*l)) {
this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
- }
- else
- {
+ } else {
cmVisualStudio10TargetGenerator tg(
*l, static_cast<cmGlobalVisualStudio10Generator*>(
- this->GetGlobalGenerator()));
+ this->GetGlobalGenerator()));
tg.Generate();
- }
}
+ }
this->WriteStampFiles();
}
-
-void cmLocalVisualStudio10Generator
-::ReadAndStoreExternalGUID(const std::string& name,
- const char* path)
+void cmLocalVisualStudio10Generator::ReadAndStoreExternalGUID(
+ const std::string& name, const char* path)
{
cmVS10XMLParser parser;
parser.ParseFile(path);
// if we can not find a GUID then we will generate one later
- if(parser.GUID.empty())
- {
+ if (parser.GUID.empty()) {
return;
- }
+ }
std::string guidStoreName = name;
guidStoreName += "_GUID_CMAKE";
// save the GUID in the cache
- this->GlobalGenerator->GetCMakeInstance()->
- AddCacheEntry(guidStoreName.c_str(),
- parser.GUID.c_str(),
- "Stored GUID",
- cmState::INTERNAL);
+ this->GlobalGenerator->GetCMakeInstance()->AddCacheEntry(
+ guidStoreName.c_str(), parser.GUID.c_str(), "Stored GUID",
+ cmState::INTERNAL);
}
const char* cmLocalVisualStudio10Generator::ReportErrorLabel() const