summaryrefslogtreecommitdiff
path: root/Source/cmConfigureFileCommand.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 10:34:04 -0400
committerBrad King <brad.king@kitware.com>2016-05-16 16:05:19 -0400
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmConfigureFileCommand.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadcmake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
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/cmConfigureFileCommand.cxx')
-rw-r--r--Source/cmConfigureFileCommand.cxx99
1 files changed, 35 insertions, 64 deletions
diff --git a/Source/cmConfigureFileCommand.cxx b/Source/cmConfigureFileCommand.cxx
index 94c778b76b..899a674fa5 100644
--- a/Source/cmConfigureFileCommand.cxx
+++ b/Source/cmConfigureFileCommand.cxx
@@ -14,26 +14,23 @@
#include <cmsys/RegularExpression.hxx>
// cmConfigureFileCommand
-bool cmConfigureFileCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmConfigureFileCommand::InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus&)
{
- if(args.size() < 2 )
- {
+ if (args.size() < 2) {
this->SetError("called with incorrect number of arguments, expected 2");
return false;
- }
+ }
const char* inFile = args[0].c_str();
- if(!cmSystemTools::FileIsFullPath(inFile))
- {
+ if (!cmSystemTools::FileIsFullPath(inFile)) {
this->InputFile = this->Makefile->GetCurrentSourceDirectory();
this->InputFile += "/";
- }
+ }
this->InputFile += inFile;
// If the input location is a directory, error out.
- if(cmSystemTools::FileIsDirectory(this->InputFile))
- {
+ if (cmSystemTools::FileIsDirectory(this->InputFile)) {
std::ostringstream e;
/* clang-format off */
e << "input location\n"
@@ -42,92 +39,72 @@ bool cmConfigureFileCommand
/* clang-format on */
this->SetError(e.str());
return false;
- }
+ }
const char* outFile = args[1].c_str();
- if(!cmSystemTools::FileIsFullPath(outFile))
- {
+ if (!cmSystemTools::FileIsFullPath(outFile)) {
this->OutputFile = this->Makefile->GetCurrentBinaryDirectory();
this->OutputFile += "/";
- }
+ }
this->OutputFile += outFile;
// If the output location is already a directory put the file in it.
- if(cmSystemTools::FileIsDirectory(this->OutputFile))
- {
+ if (cmSystemTools::FileIsDirectory(this->OutputFile)) {
this->OutputFile += "/";
this->OutputFile += cmSystemTools::GetFilenameName(inFile);
- }
+ }
- if ( !this->Makefile->CanIWriteThisFile(this->OutputFile.c_str()) )
- {
- std::string e = "attempted to configure a file: " + this->OutputFile
- + " into a source directory.";
+ if (!this->Makefile->CanIWriteThisFile(this->OutputFile.c_str())) {
+ std::string e = "attempted to configure a file: " + this->OutputFile +
+ " into a source directory.";
this->SetError(e);
cmSystemTools::SetFatalErrorOccured();
return false;
- }
+ }
std::string errorMessage;
- if (!this->NewLineStyle.ReadFromArguments(args, errorMessage))
- {
+ if (!this->NewLineStyle.ReadFromArguments(args, errorMessage)) {
this->SetError(errorMessage);
return false;
- }
+ }
this->CopyOnly = false;
this->EscapeQuotes = false;
std::string unknown_args;
this->AtOnly = false;
- for(unsigned int i=2;i < args.size();++i)
- {
- if(args[i] == "COPYONLY")
- {
+ for (unsigned int i = 2; i < args.size(); ++i) {
+ if (args[i] == "COPYONLY") {
this->CopyOnly = true;
- if (this->NewLineStyle.IsValid())
- {
+ if (this->NewLineStyle.IsValid()) {
this->SetError("COPYONLY could not be used in combination "
"with NEWLINE_STYLE");
return false;
- }
}
- else if(args[i] == "ESCAPE_QUOTES")
- {
+ } else if (args[i] == "ESCAPE_QUOTES") {
this->EscapeQuotes = true;
- }
- else if(args[i] == "@ONLY")
- {
+ } else if (args[i] == "@ONLY") {
this->AtOnly = true;
- }
- else if(args[i] == "IMMEDIATE")
- {
+ } else if (args[i] == "IMMEDIATE") {
/* Ignore legacy option. */
- }
- else if(args[i] == "NEWLINE_STYLE" ||
- args[i] == "LF" || args[i] == "UNIX" ||
- args[i] == "CRLF" || args[i] == "WIN32" ||
- args[i] == "DOS")
- {
+ } else if (args[i] == "NEWLINE_STYLE" || args[i] == "LF" ||
+ args[i] == "UNIX" || args[i] == "CRLF" || args[i] == "WIN32" ||
+ args[i] == "DOS") {
/* Options handled by NewLineStyle member above. */
- }
- else
- {
+ } else {
unknown_args += " ";
unknown_args += args[i];
unknown_args += "\n";
- }
}
- if (!unknown_args.empty())
- {
+ }
+ if (!unknown_args.empty()) {
std::string msg = "configure_file called with unknown argument(s):\n";
msg += unknown_args;
this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, msg);
- }
+ }
- if ( !this->ConfigureFile() )
- {
+ if (!this->ConfigureFile()) {
this->SetError("Problem configuring file");
return false;
- }
+ }
return true;
}
@@ -135,12 +112,6 @@ bool cmConfigureFileCommand
int cmConfigureFileCommand::ConfigureFile()
{
return this->Makefile->ConfigureFile(
- this->InputFile.c_str(),
- this->OutputFile.c_str(),
- this->CopyOnly,
- this->AtOnly,
- this->EscapeQuotes,
- this->NewLineStyle);
+ this->InputFile.c_str(), this->OutputFile.c_str(), this->CopyOnly,
+ this->AtOnly, this->EscapeQuotes, this->NewLineStyle);
}
-
-