summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/CTest/cmCTestGenericHandler.cxx3
-rw-r--r--Source/CTest/cmCTestHandlerCommand.cxx4
-rw-r--r--Source/CTest/cmCTestReadCustomFilesCommand.h4
-rw-r--r--Source/CTest/cmCTestScriptHandler.cxx9
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx5
-rw-r--r--Source/CTest/cmCTestUpdateCommand.cxx3
-rw-r--r--Source/cmAddExecutableCommand.cxx3
-rw-r--r--Source/cmAddSubDirectoryCommand.cxx9
-rw-r--r--Source/cmAddTestCommand.cxx7
-rw-r--r--Source/cmAuxSourceDirectoryCommand.cxx6
10 files changed, 33 insertions, 20 deletions
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index 6f0fb72a1f..4ce1d5beff 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -54,7 +54,8 @@ void cmCTestGenericHandler::SetOption(const char* op, const char* value)
}
//----------------------------------------------------------------------
-void cmCTestGenericHandler::SetPersistentOption(const char* op, const char* value)
+void cmCTestGenericHandler::SetPersistentOption(const char* op,
+ const char* value)
{
this->SetOption(op, value);
if ( !op )
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 89420bf499..09fd82ac3f 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -38,8 +38,8 @@ cmCTestHandlerCommand::cmCTestHandlerCommand()
bool cmCTestHandlerCommand::InitialPass(
std::vector<std::string> const& args)
{
- if ( !this->ProcessArguments(args, (unsigned int)this->Last, &*this->Arguments.begin(),
- this->Values) )
+ if ( !this->ProcessArguments(args, (unsigned int)this->Last,
+ &*this->Arguments.begin(),this->Values) )
{
return false;
}
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h
index 08febdfae2..cb870af6a8 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.h
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.h
@@ -67,8 +67,8 @@ public:
{
return
" CTEST_READ_CUSTOM_FILES( directory ... )\n"
- "Read all the CTestCustom.ctest or CTestCustom.cmake files from the given "
- "directory.";
+ "Read all the CTestCustom.ctest or CTestCustom.cmake files from "
+ "the given directory.";
}
cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand);
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index c65491f796..4149e95c13 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -167,7 +167,8 @@ cmCTestScriptHandler::~cmCTestScriptHandler()
//----------------------------------------------------------------------
// just adds an argument to the vector
-void cmCTestScriptHandler::AddConfigurationScript(const char *script, bool pscope)
+void cmCTestScriptHandler::AddConfigurationScript(const char *script,
+ bool pscope)
{
this->ConfigurationScripts.push_back(script);
this->ScriptProcessScope.push_back(pscope);
@@ -253,7 +254,8 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg)
int pipe = cmSystemTools::WaitForLine(cp, line, 100.0, out, err);
while(pipe != cmsysProcess_Pipe_None)
{
- cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Output: " << line << "\n");
+ cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Output: "
+ << line << "\n");
if(pipe == cmsysProcess_Pipe_STDERR)
{
cmCTestLog(this->CTest, ERROR_MESSAGE, line << "\n");
@@ -927,7 +929,8 @@ void cmCTestScriptHandler::RestoreBackupDirectories()
}
}
-bool cmCTestScriptHandler::RunScript(cmCTest* ctest, const char *sname, bool InProcess)
+bool cmCTestScriptHandler::RunScript(cmCTest* ctest, const char *sname,
+ bool InProcess)
{
cmCTestScriptHandler* sh = new cmCTestScriptHandler();
sh->SetCTestInstance(ctest);
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 9e2b3b1d06..1b4968dead 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -111,8 +111,9 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args)
}
fname += "/";
fname += testFilename;
- bool readit = this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(),
- fname.c_str());
+ bool readit =
+ this->Makefile->ReadListFile(this->Makefile->GetCurrentListFile(),
+ fname.c_str());
cmSystemTools::ChangeDirectory(cwd.c_str());
if(!readit)
{
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index 7d274b8d79..2c116c04b9 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -51,7 +51,8 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
= this->Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND");
if ( !initialCheckoutCommand )
{
- initialCheckoutCommand = this->Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
+ initialCheckoutCommand =
+ this->Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
}
cmCTestGenericHandler* handler
diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index b440e03a07..d44fa9aa89 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -51,7 +51,8 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
if (s == args.end())
{
- this->SetError("called with incorrect number of arguments, no sources provided");
+ this->SetError
+ ("called with incorrect number of arguments, no sources provided");
return false;
}
diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx
index a134c594ee..e6957813da 100644
--- a/Source/cmAddSubDirectoryCommand.cxx
+++ b/Source/cmAddSubDirectoryCommand.cxx
@@ -17,7 +17,8 @@
#include "cmAddSubDirectoryCommand.h"
// cmAddSubDirectoryCommand
-bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args)
+bool cmAddSubDirectoryCommand::InitialPass
+(std::vector<std::string> const& args)
{
if(args.size() < 1 )
{
@@ -103,7 +104,11 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args)
if (!cmSystemTools::FindLastString(binPath.c_str(),
this->Makefile->GetHomeDirectory()))
{
- this->SetError("A full source directory was specified that is not in the source tree but no binary directory was specified. If you specify an out of tree source directory then you must provide the binary directory as well.");
+ this->SetError("A full source directory was specified that is not "
+ "in the source tree but no binary directory was "
+ "specified. If you specify an out of tree source "
+ "directory then you must provide the binary "
+ "directory as well.");
return false;
}
cmSystemTools::ReplaceString(binPath,this->Makefile->GetHomeDirectory(),
diff --git a/Source/cmAddTestCommand.cxx b/Source/cmAddTestCommand.cxx
index 00cda185f4..cf50401c0b 100644
--- a/Source/cmAddTestCommand.cxx
+++ b/Source/cmAddTestCommand.cxx
@@ -22,10 +22,9 @@
// cmExecutableCommand
bool cmAddTestCommand::InitialPass(std::vector<std::string> const& args)
{
- // First argument is the name of the test
- // Second argument is the name of the executable to run (a target or external
- // program)
- // Remaining arguments are the arguments to pass to the executable
+ // First argument is the name of the test Second argument is the name of
+ // the executable to run (a target or external program) Remaining arguments
+ // are the arguments to pass to the executable
if(args.size() < 2 )
{
this->SetError("called with incorrect number of arguments");
diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index 892ed4aaf7..37dee8c299 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -20,7 +20,8 @@
#include <cmsys/Directory.hxx>
// cmAuxSourceDirectoryCommand
-bool cmAuxSourceDirectoryCommand::InitialPass(std::vector<std::string> const& args)
+bool cmAuxSourceDirectoryCommand::InitialPass
+(std::vector<std::string> const& args)
{
if(args.size() < 2 || args.size() > 2)
{
@@ -68,7 +69,8 @@ bool cmAuxSourceDirectoryCommand::InitialPass(std::vector<std::string> const& ar
// add the file as a class file so
// depends can be done
cmSourceFile cmfile;
- cmfile.SetName(fullname.c_str(), this->Makefile->GetCurrentDirectory(),
+ cmfile.SetName(fullname.c_str(),
+ this->Makefile->GetCurrentDirectory(),
this->Makefile->GetSourceExtensions(),
this->Makefile->GetHeaderExtensions());
cmfile.SetProperty("ABSTRACT","0");
View Lorry Controller Status