diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmIncludeExternalMSProjectCommand.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-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/cmIncludeExternalMSProjectCommand.cxx')
-rw-r--r-- | Source/cmIncludeExternalMSProjectCommand.cxx | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx index c64d128..9720d63 100644 --- a/Source/cmIncludeExternalMSProjectCommand.cxx +++ b/Source/cmIncludeExternalMSProjectCommand.cxx @@ -12,20 +12,24 @@ #include "cmIncludeExternalMSProjectCommand.h" // cmIncludeExternalMSProjectCommand -bool cmIncludeExternalMSProjectCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmIncludeExternalMSProjectCommand::InitialPass( + std::vector<std::string> const& args, cmExecutionStatus&) { - if(args.size() < 2) - { - this->SetError("INCLUDE_EXTERNAL_MSPROJECT called with incorrect " - "number of arguments"); - return false; + if (args.size() < 2) { + this->SetError("INCLUDE_EXTERNAL_MSPROJECT called with incorrect " + "number of arguments"); + return false; } // only compile this for win32 to avoid coverage errors #ifdef _WIN32 - if(this->Makefile->GetDefinition("WIN32")) + if (this->Makefile->GetDefinition("WIN32")) { + enum Doing { - enum Doing { DoingNone, DoingType, DoingGuid, DoingPlatform }; + DoingNone, + DoingType, + DoingGuid, + DoingPlatform + }; Doing doing = DoingNone; @@ -34,32 +38,31 @@ bool cmIncludeExternalMSProjectCommand std::string platformMapping; std::vector<std::string> depends; - for (unsigned int i=2; i<args.size(); ++i) - { - if (args[i] == "TYPE") - { + for (unsigned int i = 2; i < args.size(); ++i) { + if (args[i] == "TYPE") { doing = DoingType; - } - else if (args[i] == "GUID") - { + } else if (args[i] == "GUID") { doing = DoingGuid; - } - else if (args[i] == "PLATFORM") - { + } else if (args[i] == "PLATFORM") { doing = DoingPlatform; + } else { + switch (doing) { + case DoingNone: + depends.push_back(args[i]); + break; + case DoingType: + customType = args[i]; + break; + case DoingGuid: + customGuid = args[i]; + break; + case DoingPlatform: + platformMapping = args[i]; + break; } - else - { - switch (doing) - { - case DoingNone: depends.push_back(args[i]); break; - case DoingType: customType = args[i]; break; - case DoingGuid: customGuid = args[i]; break; - case DoingPlatform: platformMapping = args[i]; break; - } doing = DoingNone; - } } + } // Hack together a utility target storing enough information // to reproduce the target inclusion. @@ -68,34 +71,31 @@ bool cmIncludeExternalMSProjectCommand std::string path = args[1]; cmSystemTools::ConvertToUnixSlashes(path); - if (!customGuid.empty()) - { + if (!customGuid.empty()) { std::string guidVariable = utility_name + "_GUID_CMAKE"; this->Makefile->GetCMakeInstance()->AddCacheEntry( - guidVariable.c_str(), customGuid.c_str(), - "Stored GUID", cmState::INTERNAL); - } + guidVariable.c_str(), customGuid.c_str(), "Stored GUID", + cmState::INTERNAL); + } // Create a target instance for this utility. - cmTarget* target=this->Makefile->AddNewTarget(cmState::UTILITY, - utility_name.c_str()); + cmTarget* target = + this->Makefile->AddNewTarget(cmState::UTILITY, utility_name.c_str()); target->SetProperty("GENERATOR_FILE_NAME", utility_name.c_str()); target->SetProperty("EXTERNAL_MSPROJECT", path.c_str()); target->SetProperty("EXCLUDE_FROM_ALL", "FALSE"); if (!customType.empty()) - target->SetProperty("VS_PROJECT_TYPE",customType.c_str()); + target->SetProperty("VS_PROJECT_TYPE", customType.c_str()); if (!platformMapping.empty()) - target->SetProperty("VS_PLATFORM_MAPPING",platformMapping.c_str()); + target->SetProperty("VS_PLATFORM_MAPPING", platformMapping.c_str()); for (std::vector<std::string>::const_iterator it = depends.begin(); - it != depends.end(); - ++it) - { + it != depends.end(); ++it) { target->AddUtility(it->c_str()); - } } + } #endif return true; } |