summaryrefslogtreecommitdiffstats
path: root/Source/cmGetCMakePropertyCommand.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/cmGetCMakePropertyCommand.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/cmGetCMakePropertyCommand.cxx')
-rw-r--r--Source/cmGetCMakePropertyCommand.cxx46
1 files changed, 17 insertions, 29 deletions
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 2be4dec..331aab9 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -17,51 +17,39 @@
#include "cmake.h"
// cmGetCMakePropertyCommand
-bool cmGetCMakePropertyCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmGetCMakePropertyCommand::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;
- }
+ }
std::string variable = args[0];
std::string output = "NOTFOUND";
- if ( args[1] == "VARIABLES" )
- {
- if (const char* varsProp = this->Makefile->GetProperty("VARIABLES"))
- {
+ if (args[1] == "VARIABLES") {
+ if (const char* varsProp = this->Makefile->GetProperty("VARIABLES")) {
output = varsProp;
- }
}
- else if ( args[1] == "MACROS" )
- {
+ } else if (args[1] == "MACROS") {
output.clear();
- if (const char* macrosProp = this->Makefile->GetProperty("MACROS"))
- {
+ if (const char* macrosProp = this->Makefile->GetProperty("MACROS")) {
output = macrosProp;
- }
}
- else if ( args[1] == "COMPONENTS" )
- {
- const std::set<std::string>* components
- = this->Makefile->GetGlobalGenerator()->GetInstallComponents();
+ } else if (args[1] == "COMPONENTS") {
+ const std::set<std::string>* components =
+ this->Makefile->GetGlobalGenerator()->GetInstallComponents();
output = cmJoin(*components, ";");
- }
- else
- {
- const char *prop = 0;
- if (!args[1].empty())
- {
+ } else {
+ const char* prop = 0;
+ if (!args[1].empty()) {
prop = this->Makefile->GetState()->GetGlobalProperty(args[1]);
- }
- if (prop)
- {
+ }
+ if (prop) {
output = prop;
- }
}
+ }
this->Makefile->AddDefinition(variable, output.c_str());