mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revise C++ coding style using clang-format

Browse Source 
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.
This commit is contained in:
Kitware Robot
2016-05-16 10:34:04 -04:00
committed by Brad King
parent 82df6deaaf
commit d9fd2f5402
1450 changed files with 62404 additions and 83728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
Source/cmIncludeExternalMSProjectCommand.cxx
View File

@@ -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;
}