From aee311a89dd409329375fddd357191817277df7f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 18 May 2007 08:49:06 -0400 Subject: STYLE: fix line lengths Alex --- Source/cmFileCommand.cxx | 27 +++++++++++++++------------ Source/cmFindBase.cxx | 6 +++--- Source/cmFindBase.h | 4 +++- Source/cmInstallTargetGenerator.cxx | 9 +++++---- Source/cmTryRunCommand.cxx | 3 ++- 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 7128ca5..3c2b8ff 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1088,7 +1088,8 @@ void cmFileCommand::HandleInstallPermissions(cmFileInstaller& installer, } //---------------------------------------------------------------------------- -void cmFileCommand::GetTargetTypeFromString(const std::string& stype, int& itype) const +void cmFileCommand +::GetTargetTypeFromString(const std::string& stype, int& itype) const { if ( stype == "EXECUTABLE" ) { @@ -1118,7 +1119,8 @@ void cmFileCommand::GetTargetTypeFromString(const std::string& stype, int& itype //---------------------------------------------------------------------------- -bool cmFileCommand::HandleInstallDestination(cmFileInstaller& installer, std::string& destination) +bool cmFileCommand::HandleInstallDestination(cmFileInstaller& installer, + std::string& destination) { if ( destination.size() < 2 ) { @@ -1240,15 +1242,15 @@ bool cmFileCommand::HandleInstallCommand(std::vector const& args) //---------------------------------------------------------------------------- bool cmFileCommand::ParseInstallArgs(std::vector const& args, - cmFileInstaller& installer, - std::set& components, - std::set& configurations, - std::map& properties, - int& itype, - std::string& rename, - std::string& destination, - std::vector& files, - bool& optional) + cmFileInstaller& installer, + std::set& components, + std::set& configurations, + std::map& properties, + int& itype, + std::string& rename, + std::string& destination, + std::vector& files, + bool& optional) { std::string stype = "FILES"; bool doing_files = false; @@ -1554,7 +1556,8 @@ bool cmFileCommand::ParseInstallArgs(std::vector const& args, } if(files.size() > 1) { - this->SetError("INSTALL option RENAME may be used only with one file."); + this->SetError("INSTALL option RENAME may be used only with " + "one file."); return false; } } diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index 0c3ad86..3e945d3 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -252,10 +252,10 @@ bool cmFindBase::ParseArguments(std::vector const& argsIn) } this->AlreadyInCache = false; - std::string findRootPathVar = "CMAKE_FIND_ROOT_PATH_MODE_"; findRootPathVar += this->CMakePathName; - std::string rootPathMode = this->Makefile->GetSafeDefinition(findRootPathVar.c_str()); + std::string rootPathMode = + this->Makefile->GetSafeDefinition(findRootPathVar.c_str()); if (rootPathMode=="NEVER") { this->FindRootPathMode = RootPathModeNoRootPath; @@ -496,7 +496,7 @@ void cmFindBase::HandleCMakeFindRootPath() return; } - const char* rootPath = this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH"); + const char* rootPath = this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH"); if ((rootPath == 0) || (strlen(rootPath) == 0)) { return; diff --git a/Source/cmFindBase.h b/Source/cmFindBase.h index 95fc258..547576d 100644 --- a/Source/cmFindBase.h +++ b/Source/cmFindBase.h @@ -39,7 +39,9 @@ public: virtual const char* GetFullDocumentation() {return this->GenericDocumentation.c_str();} - enum RootPathMode { RootPathModeBoth, RootPathModeOnlyRootPath, RootPathModeNoRootPath }; + enum RootPathMode { RootPathModeBoth, + RootPathModeOnlyRootPath, + RootPathModeNoRootPath }; protected: void PrintFindStuff(); diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 1572e9a..3487c26 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -459,7 +459,7 @@ void cmInstallTargetGenerator } void cmInstallTargetGenerator::AddStripRule(std::ostream& os, - const std::string& destinationFilename) + const std::string& destinationFilename) { // Don't handle OSX Bundles. @@ -482,8 +482,8 @@ void cmInstallTargetGenerator::AddStripRule(std::ostream& os, } void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os, - cmTarget::TargetType type, - const std::string& destinationFilename) + cmTarget::TargetType type, + const std::string& destinationFilename) { // Static libraries need ranlib on this platform. if(type != cmTarget::STATIC_LIBRARY) @@ -498,7 +498,8 @@ void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os, return; } - std::string ranlib = this->Target->GetMakefile()->GetRequiredDefinition("CMAKE_RANLIB"); + std::string ranlib = this->Target->GetMakefile()->GetRequiredDefinition( + "CMAKE_RANLIB"); if (!ranlib.size()) { return; diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index 127f8ac..ab8670c 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -82,7 +82,8 @@ bool cmTryRunCommand::InitialPass(std::vector const& argv) { int retVal = -1; std::string output; - std::string executableSuffix=this->Makefile->GetDefinition("CMAKE_EXECUTABLE_SUFFIX"); + std::string executableSuffix=this->Makefile->GetDefinition( + "CMAKE_EXECUTABLE_SUFFIX"); std::string command1 = binaryDirectory; std::vector attemptedPaths; command1 += "/cmTryCompileExec"; -- cgit v0.12