summaryrefslogtreecommitdiffstats
path: root/Source/cmSourceGroupCommand.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/cmSourceGroupCommand.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/cmSourceGroupCommand.cxx')
-rw-r--r--Source/cmSourceGroupCommand.cxx63
1 files changed, 23 insertions, 40 deletions
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index fadb172..252819c 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -12,91 +12,74 @@
#include "cmSourceGroupCommand.h"
// cmSourceGroupCommand
-bool cmSourceGroupCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus&)
{
- if(args.size() < 1)
- {
+ if (args.size() < 1) {
this->SetError("called with incorrect number of arguments");
return false;
- }
+ }
std::string delimiter = "\\";
- if(this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER"))
- {
+ if (this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER")) {
delimiter = this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER");
- }
+ }
std::vector<std::string> folders =
cmSystemTools::tokenize(args[0], delimiter);
cmSourceGroup* sg = 0;
sg = this->Makefile->GetSourceGroup(folders);
- if(!sg)
- {
+ if (!sg) {
this->Makefile->AddSourceGroup(folders);
sg = this->Makefile->GetSourceGroup(folders);
- }
+ }
- if(!sg)
- {
+ if (!sg) {
this->SetError("Could not create or find source group");
return false;
- }
+ }
// If only two arguments are given, the pre-1.8 version of the
// command is being invoked.
- if(args.size() == 2 && args[1] != "FILES")
- {
+ if (args.size() == 2 && args[1] != "FILES") {
sg->SetGroupRegex(args[1].c_str());
return true;
- }
+ }
// Process arguments.
bool doingFiles = false;
- for(unsigned int i=1; i < args.size(); ++i)
- {
- if(args[i] == "REGULAR_EXPRESSION")
- {
+ for (unsigned int i = 1; i < args.size(); ++i) {
+ if (args[i] == "REGULAR_EXPRESSION") {
// Next argument must specify the regex.
- if(i+1 < args.size())
- {
+ if (i + 1 < args.size()) {
++i;
sg->SetGroupRegex(args[i].c_str());
- }
- else
- {
+ } else {
this->SetError("REGULAR_EXPRESSION argument given without a regex.");
return false;
- }
- doingFiles = false;
}
- else if(args[i] == "FILES")
- {
+ doingFiles = false;
+ } else if (args[i] == "FILES") {
// Next arguments will specify files.
doingFiles = true;
- }
- else if(doingFiles)
- {
+ } else if (doingFiles) {
// Convert name to full path and add to the group's list.
std::string src = args[i];
- if(!cmSystemTools::FileIsFullPath(src.c_str()))
- {
+ if (!cmSystemTools::FileIsFullPath(src.c_str())) {
src = this->Makefile->GetCurrentSourceDirectory();
src += "/";
src += args[i];
- }
+ }
src = cmSystemTools::CollapseFullPath(src.c_str());
sg->AddGroupFile(src);
- }
- else
- {
+ } else {
std::ostringstream err;
err << "Unknown argument \"" << args[i] << "\". "
<< "Perhaps the FILES keyword is missing.\n";
this->SetError(err.str());
return false;
- }
}
+ }
return true;
}