summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-05-12 17:44:15 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-05-12 17:44:15 (GMT)
commit2bb24565e5fb9ba99aa3164332a81504a7eb51b0 (patch)
tree41bdef6a46b275c37f4d958959210c9c08baf7d3
parent3c4bfa10037d91f89fc25c51da5239136148bfa6 (diff)
downloadCMake-2bb24565e5fb9ba99aa3164332a81504a7eb51b0.zip
CMake-2bb24565e5fb9ba99aa3164332a81504a7eb51b0.tar.gz
CMake-2bb24565e5fb9ba99aa3164332a81504a7eb51b0.tar.bz2
STYLE: fix line length
-rw-r--r--Source/cmProjectCommand.cxx14
-rw-r--r--Source/cmQTWrapCPPCommand.cxx15
-rw-r--r--Source/cmQTWrapUICommand.cxx15
-rw-r--r--Source/cmRemoveDefinitionsCommand.cxx3
4 files changed, 30 insertions, 17 deletions
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index bdbafbf..5ae4c16 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -31,12 +31,14 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args)
std::string srcdir = args[0];
srcdir += "_SOURCE_DIR";
- this->Makefile->AddCacheDefinition(bindir.c_str(),
- this->Makefile->GetCurrentOutputDirectory(),
- "Value Computed by CMake", cmCacheManager::STATIC);
- this->Makefile->AddCacheDefinition(srcdir.c_str(),
- this->Makefile->GetCurrentDirectory(),
- "Value Computed by CMake", cmCacheManager::STATIC);
+ this->Makefile->AddCacheDefinition
+ (bindir.c_str(),
+ this->Makefile->GetCurrentOutputDirectory(),
+ "Value Computed by CMake", cmCacheManager::STATIC);
+ this->Makefile->AddCacheDefinition
+ (srcdir.c_str(),
+ this->Makefile->GetCurrentDirectory(),
+ "Value Computed by CMake", cmCacheManager::STATIC);
bindir = "PROJECT_BINARY_DIR";
srcdir = "PROJECT_SOURCE_DIR";
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx
index 0ddf382..8a590a7 100644
--- a/Source/cmQTWrapCPPCommand.cxx
+++ b/Source/cmQTWrapCPPCommand.cxx
@@ -57,9 +57,11 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
{
file.SetProperty("ABSTRACT",curr->GetProperty("ABSTRACT"));
}
- std::string srcName = cmSystemTools::GetFilenameWithoutLastExtension(*j);
+ std::string srcName =
+ cmSystemTools::GetFilenameWithoutLastExtension(*j);
std::string newName = "moc_" + srcName;
- file.SetName(newName.c_str(), this->Makefile->GetCurrentOutputDirectory(),
+ file.SetName(newName.c_str(),
+ this->Makefile->GetCurrentOutputDirectory(),
"cxx",false);
std::string hname;
if ( (*j)[0] == '/' || (*j)[1] == ':' )
@@ -70,7 +72,8 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
{
if ( curr && curr->GetPropertyAsBool("GENERATED") )
{
- hname = std::string( this->Makefile->GetCurrentOutputDirectory() ) + "/" + *j;
+ hname = std::string(this->Makefile->GetCurrentOutputDirectory())
+ + "/" + *j;
}
else
{
@@ -89,7 +92,8 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
}
}
- this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str());
+ this->Makefile->AddDefinition(this->SourceList.c_str(),
+ sourceListValue.c_str());
return true;
}
@@ -99,7 +103,8 @@ void cmQTWrapCPPCommand::FinalPass()
// first we add the rules for all the .h to Moc files
size_t lastClass = this->WrapClasses.size();
std::vector<std::string> depends;
- const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
+ const char* moc_exe =
+ this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
// wrap all the .h files
depends.push_back(moc_exe);
diff --git a/Source/cmQTWrapUICommand.cxx b/Source/cmQTWrapUICommand.cxx
index 717459c..9bec97f 100644
--- a/Source/cmQTWrapUICommand.cxx
+++ b/Source/cmQTWrapUICommand.cxx
@@ -75,7 +75,8 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
{
if ( curr && curr->GetPropertyAsBool("GENERATED") )
{
- origname = std::string( this->Makefile->GetCurrentOutputDirectory() ) + "/" + *j;
+ origname = std::string(this->Makefile->GetCurrentOutputDirectory())
+ + "/" + *j;
}
else
{
@@ -114,8 +115,10 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
}
}
- this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str());
- this->Makefile->AddDefinition(this->HeaderList.c_str(), headerListValue.c_str());
+ this->Makefile->AddDefinition(this->SourceList.c_str(),
+ sourceListValue.c_str());
+ this->Makefile->AddDefinition(this->HeaderList.c_str(),
+ headerListValue.c_str());
return true;
}
@@ -125,8 +128,10 @@ void cmQTWrapUICommand::FinalPass()
// first we add the rules for all the .ui to .h and .cxx files
size_t lastHeadersClass = this->WrapHeadersClasses.size();
std::vector<std::string> depends;
- const char* uic_exe = this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE");
- const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
+ const char* uic_exe =
+ this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE");
+ const char* moc_exe =
+ this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
// wrap all the .h files
depends.push_back(uic_exe);
diff --git a/Source/cmRemoveDefinitionsCommand.cxx b/Source/cmRemoveDefinitionsCommand.cxx
index 918b1f4..7641171 100644
--- a/Source/cmRemoveDefinitionsCommand.cxx
+++ b/Source/cmRemoveDefinitionsCommand.cxx
@@ -17,7 +17,8 @@
#include "cmRemoveDefinitionsCommand.h"
// cmRemoveDefinitionsCommand
-bool cmRemoveDefinitionsCommand::InitialPass(std::vector<std::string> const& args)
+bool cmRemoveDefinitionsCommand
+::InitialPass(std::vector<std::string> const& args)
{
// it is OK to have no arguments
if(args.size() < 1 )