From d9fd2f5402eeaa345691313658e02b51038f570b Mon Sep 17 00:00:00 2001 From: Kitware Robot Date: Mon, 16 May 2016 10:34:04 -0400 Subject: 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. --- Source/cmBuildNameCommand.cxx | 71 ++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 42 deletions(-) (limited to 'Source/cmBuildNameCommand.cxx') diff --git a/Source/cmBuildNameCommand.cxx b/Source/cmBuildNameCommand.cxx index 2733d76779..7ed96ab4c5 100644 --- a/Source/cmBuildNameCommand.cxx +++ b/Source/cmBuildNameCommand.cxx @@ -14,67 +14,54 @@ #include // cmBuildNameCommand -bool cmBuildNameCommand -::InitialPass(std::vector const& args, cmExecutionStatus &) +bool cmBuildNameCommand::InitialPass(std::vector const& args, + cmExecutionStatus&) { - if(this->Disallowed(cmPolicies::CMP0036, - "The build_name command should not be called; see CMP0036.")) - { return true; } - if(args.size() < 1 ) - { + if (this->Disallowed( + cmPolicies::CMP0036, + "The build_name command should not be called; see CMP0036.")) { + return true; + } + if (args.size() < 1) { this->SetError("called with incorrect number of arguments"); return false; - } + } const char* cacheValue = this->Makefile->GetDefinition(args[0]); - if(cacheValue) - { + if (cacheValue) { // do we need to correct the value? cmsys::RegularExpression reg("[()/]"); - if (reg.find(cacheValue)) - { + if (reg.find(cacheValue)) { std::string cv = cacheValue; - cmSystemTools::ReplaceString(cv,"/", "_"); - cmSystemTools::ReplaceString(cv,"(", "_"); - cmSystemTools::ReplaceString(cv,")", "_"); - this->Makefile->AddCacheDefinition(args[0], - cv.c_str(), - "Name of build.", - cmState::STRING); - } - return true; + cmSystemTools::ReplaceString(cv, "/", "_"); + cmSystemTools::ReplaceString(cv, "(", "_"); + cmSystemTools::ReplaceString(cv, ")", "_"); + this->Makefile->AddCacheDefinition(args[0], cv.c_str(), "Name of build.", + cmState::STRING); } - + return true; + } std::string buildname = "WinNT"; - if(this->Makefile->GetDefinition("UNIX")) - { + if (this->Makefile->GetDefinition("UNIX")) { buildname = ""; cmSystemTools::RunSingleCommand("uname -a", &buildname, &buildname); - if(!buildname.empty()) - { + if (!buildname.empty()) { std::string RegExp = "([^ ]*) [^ ]* ([^ ]*) "; - cmsys::RegularExpression reg( RegExp.c_str() ); - if(reg.find(buildname.c_str())) - { + cmsys::RegularExpression reg(RegExp.c_str()); + if (reg.find(buildname.c_str())) { buildname = reg.match(1) + "-" + reg.match(2); - } } } + } std::string compiler = "${CMAKE_CXX_COMPILER}"; - this->Makefile->ExpandVariablesInString ( compiler ); + this->Makefile->ExpandVariablesInString(compiler); buildname += "-"; buildname += cmSystemTools::GetFilenameName(compiler); - cmSystemTools::ReplaceString(buildname, - "/", "_"); - cmSystemTools::ReplaceString(buildname, - "(", "_"); - cmSystemTools::ReplaceString(buildname, - ")", "_"); + cmSystemTools::ReplaceString(buildname, "/", "_"); + cmSystemTools::ReplaceString(buildname, "(", "_"); + cmSystemTools::ReplaceString(buildname, ")", "_"); - this->Makefile->AddCacheDefinition(args[0], - buildname.c_str(), - "Name of build.", - cmState::STRING); + this->Makefile->AddCacheDefinition(args[0], buildname.c_str(), + "Name of build.", cmState::STRING); return true; } - -- cgit v1.2.1