mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -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/cmIncludeCommand.cxx
+61 -89
View File
@@ -11,97 +11,77 @@
============================================================================*/
#include "cmIncludeCommand.h"
// cmIncludeCommand
bool cmIncludeCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
bool cmIncludeCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
{
if (args.size()< 1 || args.size() > 4)
{
this->SetError("called with wrong number of arguments. "
"include() only takes one file.");
return false;
}
if (args.size() < 1 || args.size() > 4) {
this->SetError("called with wrong number of arguments. "
"include() only takes one file.");
return false;
}
bool optional = false;
bool noPolicyScope = false;
std::string fname = args[0];
std::string resultVarName;
for (unsigned int i=1; i<args.size(); i++)
{
if (args[i] == "OPTIONAL")
{
if (optional)
{
for (unsigned int i = 1; i < args.size(); i++) {
if (args[i] == "OPTIONAL") {
if (optional) {
this->SetError("called with invalid arguments: OPTIONAL used twice");
return false;
}
optional = true;
}
else if(args[i] == "RESULT_VARIABLE")
{
if (!resultVarName.empty())
{
optional = true;
} else if (args[i] == "RESULT_VARIABLE") {
if (!resultVarName.empty()) {
this->SetError("called with invalid arguments: "
"only one result variable allowed");
"only one result variable allowed");
return false;
}
if(++i < args.size())
{
}
if (++i < args.size()) {
resultVarName = args[i];
}
else
{
} else {
this->SetError("called with no value for RESULT_VARIABLE.");
return false;
}
}
else if(args[i] == "NO_POLICY_SCOPE")
{
} else if (args[i] == "NO_POLICY_SCOPE") {
noPolicyScope = true;
}
else if(i > 1) // compat.: in previous cmake versions the second
} else if (i > 1) // compat.: in previous cmake versions the second
// parameter was ignored if it wasn't "OPTIONAL"
{
std::string errorText = "called with invalid argument: ";
errorText += args[i];
this->SetError(errorText);
return false;
}
}
if(fname.empty())
{
std::string errorText = "called with invalid argument: ";
errorText += args[i];
this->SetError(errorText);
return false;
}
}
if (fname.empty()) {
this->Makefile->IssueMessage(cmake::AUTHOR_WARNING,
"include() given empty file name (ignored).");
return true;
}
}
if(!cmSystemTools::FileIsFullPath(fname.c_str()))
{
if (!cmSystemTools::FileIsFullPath(fname.c_str())) {
// Not a path. Maybe module.
std::string module = fname;
module += ".cmake";
std::string mfile = this->Makefile->GetModulesFile(module.c_str());
if (!mfile.empty())
{
if (!mfile.empty()) {
fname = mfile.c_str();
}
}
}
std::string fname_abs =
cmSystemTools::CollapseFullPath(fname,
this->Makefile->GetCurrentSourceDirectory());
std::string fname_abs = cmSystemTools::CollapseFullPath(
fname, this->Makefile->GetCurrentSourceDirectory());
cmGlobalGenerator *gg = this->Makefile->GetGlobalGenerator();
if (gg->IsExportedTargetsFile(fname_abs))
{
const char *modal = 0;
cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
if (gg->IsExportedTargetsFile(fname_abs)) {
const char* modal = 0;
std::ostringstream e;
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0024))
{
switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0024)) {
case cmPolicies::WARN:
e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0024) << "\n";
modal = "should";
@@ -112,55 +92,47 @@ bool cmIncludeCommand
case cmPolicies::NEW:
modal = "may";
messageType = cmake::FATAL_ERROR;
}
if (modal)
{
}
if (modal) {
e << "The file\n " << fname_abs << "\nwas generated by the export() "
"command. It " << modal << " not be used as the argument to the "
"include() command. Use ALIAS targets instead to refer to targets "
"by alternative names.\n";
"command. It "
<< modal
<< " not be used as the argument to the "
"include() command. Use ALIAS targets instead to refer to targets "
"by alternative names.\n";
this->Makefile->IssueMessage(messageType, e.str());
if (messageType == cmake::FATAL_ERROR)
{
if (messageType == cmake::FATAL_ERROR) {
return false;
}
}
}
gg->CreateGenerationObjects();
gg->GenerateImportFile(fname_abs);
}
}
std::string listFile =
cmSystemTools::CollapseFullPath(fname.c_str(),
this->Makefile->GetCurrentSourceDirectory());
if(optional && !cmSystemTools::FileExists(listFile.c_str()))
{
if (!resultVarName.empty())
{
std::string listFile = cmSystemTools::CollapseFullPath(
fname.c_str(), this->Makefile->GetCurrentSourceDirectory());
if (optional && !cmSystemTools::FileExists(listFile.c_str())) {
if (!resultVarName.empty()) {
this->Makefile->AddDefinition(resultVarName, "NOTFOUND");
}
return true;
}
return true;
}
bool readit =
this->Makefile->ReadDependentFile(listFile.c_str(), noPolicyScope);
// add the location of the included file if a result variable was given
if (!resultVarName.empty())
{
this->Makefile->AddDefinition(resultVarName,
readit?fname_abs.c_str():"NOTFOUND");
}
if (!resultVarName.empty()) {
this->Makefile->AddDefinition(resultVarName,
readit ? fname_abs.c_str() : "NOTFOUND");
}
if(!optional && !readit && !cmSystemTools::GetFatalErrorOccured())
{
std::string m =
"could not find load file:\n"
" ";
if (!optional && !readit && !cmSystemTools::GetFatalErrorOccured()) {
std::string m = "could not find load file:\n"
" ";
m += fname;
this->SetError(m);
return false;
}
}
return true;
}