summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestUpdateCommand.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-03-09 16:17:10 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-03-09 16:17:10 (GMT)
commit6503a0eecce984c3c5ede6f0d1f4951a14f9cc3f (patch)
treea47c2d44773e08cd539959332fbb7fe688b35090 /Source/CTest/cmCTestUpdateCommand.cxx
parent10d1b2079072150321ee29b249fc39f116671375 (diff)
downloadCMake-6503a0eecce984c3c5ede6f0d1f4951a14f9cc3f.zip
CMake-6503a0eecce984c3c5ede6f0d1f4951a14f9cc3f.tar.gz
CMake-6503a0eecce984c3c5ede6f0d1f4951a14f9cc3f.tar.bz2
STYLE: Fix some style issues
Diffstat (limited to 'Source/CTest/cmCTestUpdateCommand.cxx')
-rw-r--r--Source/CTest/cmCTestUpdateCommand.cxx42
1 files changed, 27 insertions, 15 deletions
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index 6b6d443..04bbe93 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -9,8 +9,8 @@
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -43,16 +43,18 @@ bool cmCTestUpdateCommand::InitialPass(
{
if ( res_var )
{
- this->SetError("called with incorrect number of arguments. RETURN_VALUE specified twice.");
+ this->SetError("called with incorrect number of arguments. "
+ "RETURN_VALUE specified twice.");
return false;
}
havereturn_variable = true;
- }
+ }
else if(args[i] == "SOURCE")
{
if ( source_dir )
{
- this->SetError("called with incorrect number of arguments. SOURCE specified twice.");
+ this->SetError("called with incorrect number of arguments. SOURCE "
+ "specified twice.");
return false;
}
havesource = true;
@@ -60,20 +62,28 @@ bool cmCTestUpdateCommand::InitialPass(
else
{
cmOStringStream str;
- str << "called with incorrect number of arguments. Extra argument is: " << args[i].c_str() << ".";
+ str << "called with incorrect number of arguments. Extra argument is: "
+ << args[i].c_str() << ".";
this->SetError(str.str().c_str());
return false;
}
}
- m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "UpdateCommand", "CTEST_UPDATE_COMMAND");
- m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "UpdateOptions", "CTEST_UPDATE_OPTIONS");
- m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "CVSCommand", "CTEST_CVS_COMMAND");
- m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "CVSUpdateOptions", "CTEST_CVS_UPDATE_OPTIONS");
- m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "SVNCommand", "CTEST_SVN_COMMAND");
- m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS");
+ m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ "UpdateCommand", "CTEST_UPDATE_COMMAND");
+ m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ "UpdateOptions", "CTEST_UPDATE_OPTIONS");
+ m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ "CVSCommand", "CTEST_CVS_COMMAND");
+ m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ "CVSUpdateOptions", "CTEST_CVS_UPDATE_OPTIONS");
+ m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ "SVNCommand", "CTEST_SVN_COMMAND");
+ m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ "SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS");
- const char* initialCheckoutCommand = m_Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND");
+ const char* initialCheckoutCommand
+ = m_Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND");
if ( !initialCheckoutCommand )
{
initialCheckoutCommand = m_Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
@@ -95,14 +105,16 @@ bool cmCTestUpdateCommand::InitialPass(
{
handler->SetOption("InitialCheckout", initialCheckoutCommand);
}
- if ( (!cmSystemTools::FileExists(source_dir) || !cmSystemTools::FileIsDirectory(source_dir))
+ if ( (!cmSystemTools::FileExists(source_dir) ||
+ !cmSystemTools::FileIsDirectory(source_dir))
&& !initialCheckoutCommand )
{
cmOStringStream str;
str << "cannot find source directory: " << source_dir << ".";
if ( !cmSystemTools::FileExists(source_dir) )
{
- str << " Looks like it is not checked out yet. Please specify CTEST_CHECKOUT_COMMAND.";
+ str << " Looks like it is not checked out yet. Please specify "
+ "CTEST_CHECKOUT_COMMAND.";
}
this->SetError(str.str().c_str());
return false;