summaryrefslogtreecommitdiffstats
path: root/Source/cmSetTargetPropertiesCommand.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/cmSetTargetPropertiesCommand.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/cmSetTargetPropertiesCommand.cxx')
-rw-r--r--Source/cmSetTargetPropertiesCommand.cxx77
1 files changed, 31 insertions, 46 deletions
diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index b4c58d4..86c8016 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -14,87 +14,72 @@
#include "cmGlobalGenerator.h"
// cmSetTargetPropertiesCommand
-bool cmSetTargetPropertiesCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmSetTargetPropertiesCommand::InitialPass(
+ std::vector<std::string> const& args, cmExecutionStatus&)
{
- if(args.size() < 2 )
- {
+ if (args.size() < 2) {
this->SetError("called with incorrect number of arguments");
return false;
- }
+ }
// first collect up the list of files
std::vector<std::string> propertyPairs;
int numFiles = 0;
std::vector<std::string>::const_iterator j;
- for(j= args.begin(); j != args.end();++j)
- {
- if(*j == "PROPERTIES")
- {
+ for (j = args.begin(); j != args.end(); ++j) {
+ if (*j == "PROPERTIES") {
// now loop through the rest of the arguments, new style
++j;
- if (std::distance(j, args.end()) % 2 != 0)
- {
+ if (std::distance(j, args.end()) % 2 != 0) {
this->SetError("called with incorrect number of arguments.");
return false;
- }
+ }
propertyPairs.insert(propertyPairs.end(), j, args.end());
break;
- }
- else
- {
+ } else {
numFiles++;
- }
- }
- if(propertyPairs.empty())
- {
- this->SetError("called with illegal arguments, maybe missing "
- "a PROPERTIES specifier?");
- return false;
}
+ }
+ if (propertyPairs.empty()) {
+ this->SetError("called with illegal arguments, maybe missing "
+ "a PROPERTIES specifier?");
+ return false;
+ }
// now loop over all the targets
int i;
- for(i = 0; i < numFiles; ++i)
- {
- if (this->Makefile->IsAlias(args[i]))
- {
+ for (i = 0; i < numFiles; ++i) {
+ if (this->Makefile->IsAlias(args[i])) {
this->SetError("can not be used on an ALIAS target.");
return false;
- }
- bool ret = cmSetTargetPropertiesCommand::SetOneTarget
- (args[i],propertyPairs,this->Makefile);
- if (!ret)
- {
+ }
+ bool ret = cmSetTargetPropertiesCommand::SetOneTarget(
+ args[i], propertyPairs, this->Makefile);
+ if (!ret) {
std::string message = "Can not find target to add properties to: ";
message += args[i];
this->SetError(message);
return false;
- }
}
+ }
return true;
}
-bool cmSetTargetPropertiesCommand
-::SetOneTarget(const std::string& tname,
- std::vector<std::string> &propertyPairs,
- cmMakefile *mf)
+bool cmSetTargetPropertiesCommand::SetOneTarget(
+ const std::string& tname, std::vector<std::string>& propertyPairs,
+ cmMakefile* mf)
{
- if(cmTarget* target = mf->FindTargetToUse(tname))
- {
+ if (cmTarget* target = mf->FindTargetToUse(tname)) {
// now loop through all the props and set them
unsigned int k;
- for (k = 0; k < propertyPairs.size(); k = k + 2)
- {
- target->SetProperty(propertyPairs[k],
- propertyPairs[k+1].c_str());
+ for (k = 0; k < propertyPairs.size(); k = k + 2) {
+ target->SetProperty(propertyPairs[k], propertyPairs[k + 1].c_str());
target->CheckProperty(propertyPairs[k], mf);
- }
}
+ }
// if file is not already in the makefile, then add it
- else
- {
+ else {
return false;
- }
+ }
return true;
}