mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05: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
Source/cmLoadCacheCommand.cxx
+57 -83
View File
@@ -15,76 +15,63 @@
#include <cmsys/RegularExpression.hxx>
// cmLoadCacheCommand
bool cmLoadCacheCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
{
if (args.size()< 1)
{
if (args.size() < 1) {
this->SetError("called with wrong number of arguments.");
}
}
if(args.size() >= 2 && args[1] == "READ_WITH_PREFIX")
{
if (args.size() >= 2 && args[1] == "READ_WITH_PREFIX") {
return this->ReadWithPrefix(args);
}
}
// Cache entries to be excluded from the import list.
// If this set is empty, all cache entries are brought in
// and they can not be overridden.
bool excludeFiles=false;
bool excludeFiles = false;
unsigned int i;
std::set<std::string> excludes;
for(i=0; i<args.size(); i++)
{
if (excludeFiles)
{
for (i = 0; i < args.size(); i++) {
if (excludeFiles) {
excludes.insert(args[i]);
}
if (args[i] == "EXCLUDE")
{
excludeFiles=true;
}
if (excludeFiles && (args[i] == "INCLUDE_INTERNALS"))
{
break;
}
}
if (args[i] == "EXCLUDE") {
excludeFiles = true;
}
if (excludeFiles && (args[i] == "INCLUDE_INTERNALS")) {
break;
}
}
// Internal cache entries to be imported.
// If this set is empty, no internal cache entries are
// brought in.
bool includeFiles=false;
bool includeFiles = false;
std::set<std::string> includes;
for(i=0; i<args.size(); i++)
{
if (includeFiles)
{
for (i = 0; i < args.size(); i++) {
if (includeFiles) {
includes.insert(args[i]);
}
if (args[i] == "INCLUDE_INTERNALS")
{
includeFiles=true;
}
if (includeFiles && (args[i] == "EXCLUDE"))
{
break;
}
}
if (args[i] == "INCLUDE_INTERNALS") {
includeFiles = true;
}
if (includeFiles && (args[i] == "EXCLUDE")) {
break;
}
}
// Loop over each build directory listed in the arguments. Each
// directory has a cache file.
for(i=0; i<args.size(); i++)
{
if ((args[i] == "EXCLUDE") || (args[i] == "INCLUDE_INTERNALS"))
{
for (i = 0; i < args.size(); i++) {
if ((args[i] == "EXCLUDE") || (args[i] == "INCLUDE_INTERNALS")) {
break;
}
this->Makefile->GetCMakeInstance()->LoadCache(args[i], false,
excludes, includes);
}
this->Makefile->GetCMakeInstance()->LoadCache(args[i], false, excludes,
includes);
}
return true;
}
@@ -92,20 +79,18 @@ bool cmLoadCacheCommand
bool cmLoadCacheCommand::ReadWithPrefix(std::vector<std::string> const& args)
{
// Make sure we have a prefix.
if(args.size() < 3)
{
if (args.size() < 3) {
this->SetError("READ_WITH_PREFIX form must specify a prefix.");
return false;
}
}
// Make sure the cache file exists.
std::string cacheFile = args[0]+"/CMakeCache.txt";
if(!cmSystemTools::FileExists(cacheFile.c_str()))
{
std::string cacheFile = args[0] + "/CMakeCache.txt";
if (!cmSystemTools::FileExists(cacheFile.c_str())) {
std::string e = "Cannot load cache file from " + cacheFile;
this->SetError(e);
return false;
}
}
// Prepare the table of variables to read.
this->Prefix = args[2];
@@ -120,47 +105,41 @@ bool cmLoadCacheCommand::ReadWithPrefix(std::vector<std::string> const& args)
const int bufferSize = 4096;
char buffer[bufferSize];
std::string line;
while(fin)
{
while (fin) {
// Read a block of the file.
fin.read(buffer, bufferSize);
if(fin.gcount())
{
if (fin.gcount()) {
// Parse for newlines directly.
const char* i = buffer;
const char* end = buffer+fin.gcount();
while(i != end)
{
const char* end = buffer + fin.gcount();
while (i != end) {
const char* begin = i;
while(i != end && *i != '\n') { ++i; }
if(i == begin || *(i-1) != '\r')
{
while (i != end && *i != '\n') {
++i;
}
if (i == begin || *(i - 1) != '\r') {
// Include this portion of the line.
line += std::string(begin, i-begin);
}
else
{
line += std::string(begin, i - begin);
} else {
// Include this portion of the line.
// Don't include the \r in a \r\n pair.
line += std::string(begin, i-1-begin);
}
if(i != end)
{
line += std::string(begin, i - 1 - begin);
}
if (i != end) {
// Completed a line.
this->CheckLine(line.c_str());
line = "";
// Skip the newline character.
++i;
}
}
}
}
if(!line.empty())
{
}
if (!line.empty()) {
// Partial last line.
this->CheckLine(line.c_str());
}
}
return true;
}
@@ -171,22 +150,17 @@ void cmLoadCacheCommand::CheckLine(const char* line)
std::string var;
std::string value;
cmState::CacheEntryType type = cmState::UNINITIALIZED;
if(cmake::ParseCacheEntry(line, var, value, type))
{
if (cmake::ParseCacheEntry(line, var, value, type)) {
// Found a real entry. See if this one was requested.
if(this->VariablesToRead.find(var) != this->VariablesToRead.end())
{
if (this->VariablesToRead.find(var) != this->VariablesToRead.end()) {
// This was requested. Set this variable locally with the given
// prefix.
var = this->Prefix + var;
if(!value.empty())
{
if (!value.empty()) {
this->Makefile->AddDefinition(var, value.c_str());
}
else
{
} else {
this->Makefile->RemoveDefinition(var);
}
}
}
}
}