From 55303d6dd27678dd1446f3836b0292053f856a4c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 20 Jul 2007 08:36:16 -0400 Subject: STYLE: fix line lengths Alex --- Source/CTest/cmCTestScriptHandler.cxx | 3 ++- Source/cmDocumentation.cxx | 19 ++++++++++--------- Source/cmExportCommand.h | 3 ++- Source/cmExtraCodeBlocksGenerator.cxx | 11 +++++++---- Source/cmExtraCodeBlocksGenerator.h | 6 +++--- Source/cmFileCommand.cxx | 2 +- Source/cmGlobalGenerator.cxx | 12 +++++++----- Source/cmGlobalGenerator.h | 7 +++++-- Source/cmHexFileConverter.cxx | 3 ++- Source/cmIncludeExternalMSProjectCommand.cxx | 4 +++- Source/cmMakefile.cxx | 2 +- Source/cmMakefile.h | 4 +++- Source/cmTryCompileCommand.h | 6 +++--- Source/cmTryRunCommand.h | 7 +++++-- Source/cmake.h | 3 ++- 15 files changed, 56 insertions(+), 36 deletions(-) diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index da7e7c5..db44531 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -340,7 +340,8 @@ void cmCTestScriptHandler::CreateCMake() this->AddCTestCommand(new cmCTestUpdateCommand); } -void cmCTestScriptHandler::GetCommandDocumentation(std::vector& v) const +void cmCTestScriptHandler::GetCommandDocumentation( + std::vector& v) const { this->CMake->GetCommandDocumentation(v); } diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index 7f5e63c..fddbe9a 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -50,7 +50,8 @@ static const cmDocumentationEntry cmDocumentationStandardOptions[] = static const cmDocumentationEntry cmModulesDocumentationDescription[] = { {0, - " CMake Modules - Modules coming with CMake, the Cross-Platform Makefile Generator.", 0}, + " CMake Modules - Modules coming with CMake, the Cross-Platform Makefile " + "Generator.", 0}, // CMAKE_DOCUMENTATION_OVERVIEW, {0, "This is the documentation for the modules and scripts coming with CMake. " @@ -69,10 +70,10 @@ static const cmDocumentationEntry cmPropertiesDocumentationDescription[] = // CMAKE_DOCUMENTATION_OVERVIEW, {0, "This is the documentation for the properties supported by CMake. " - "Properties can have different scopes. They can either be assigned to a source file, " - "a directory, a target or globally to CMake. " - "By modifying the values of properties the behaviour of the buildsystem can be " - "customized.", 0}, + "Properties can have different scopes. They can either be assigned to a " + "source file, a directory, a target or globally to CMake. By modifying the " + "values of properties the behaviour of the buildsystem can be customized.", + 0}, {0,0,0} }; @@ -84,9 +85,9 @@ static const cmDocumentationEntry cmCompatCommandsDocumentationDescription[] = "Obsolete commands supported by CMake for compatibility.", 0}, // CMAKE_DOCUMENTATION_OVERVIEW, {0, - "This is the documentation for now obsolete listfile commands from " - "previous CMake versions, which are still supported for compatibility reasons. " - "You should instead use the newer, faster and shinier new commands. ;-)", 0}, + "This is the documentation for now obsolete listfile commands from previous " + "CMake versions, which are still supported for compatibility reasons. You " + "should instead use the newer, faster and shinier new commands. ;-)", 0}, {0,0,0} }; @@ -813,7 +814,7 @@ void cmDocumentation break; case cmProperty::DIRECTORY: this->DirectoryPropertiesSection.Set( - cmDocumentationDirectoryPropertiesHeader, section, 0); + cmDocumentationDirectoryPropertiesHeader, section, 0); break; case cmProperty::TARGET: this->TargetPropertiesSection.Set( diff --git a/Source/cmExportCommand.h b/Source/cmExportCommand.h index c5a13f9..22b5904 100644 --- a/Source/cmExportCommand.h +++ b/Source/cmExportCommand.h @@ -63,7 +63,8 @@ public: virtual const char* GetFullDocumentation() { return - " EXPORT(TARGETS tgt1 tgt2 ... [PREFIX ] FILE [APPEND])\n" + " EXPORT(TARGETS tgt1 tgt2 ... [PREFIX ] FILE " + "[APPEND])\n" "Create a file that can be included into a CMake listfile with the " "INCLUDE command. The file will contain a number of SET commands " "that will set all the variables needed for library dependency " diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 945d72a..92a306e 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -67,7 +67,8 @@ void cmExtraCodeBlocksGenerator::SetGlobalGenerator( void cmExtraCodeBlocksGenerator::Generate() { - const cmMakefile* topLevelMakefile = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile(); + const cmMakefile* topLevelMakefile = + this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile(); std::string workspaceName = topLevelMakefile->GetProjectName(); std::string outputDir=topLevelMakefile->GetStartOutputDirectory(); @@ -119,7 +120,8 @@ void cmExtraCodeBlocksGenerator::Generate() /* create the project file, if it already exists, merge it with the existing one, otherwise create a new one */ -void cmExtraCodeBlocksGenerator::CreateProjectFile(const std::vector& lgs) +void cmExtraCodeBlocksGenerator::CreateProjectFile( + const std::vector& lgs) { const cmMakefile* mf=lgs[0]->GetMakefile(); std::string outputDir=mf->GetStartOutputDirectory(); @@ -245,7 +247,7 @@ void cmExtraCodeBlocksGenerator case cmTarget::SHARED_LIBRARY: case cmTarget::MODULE_LIBRARY: { - const std::vector& sources=ti->second.GetSourceFiles(); + const std::vector&sources=ti->second.GetSourceFiles(); for (std::vector::const_iterator si=sources.begin(); si!=sources.end(); si++) { @@ -258,7 +260,8 @@ void cmExtraCodeBlocksGenerator } } - for (std::map::const_iterator sit=sourceFiles.begin(); + for (std::map::const_iterator + sit=sourceFiles.begin(); sit!=sourceFiles.end(); ++sit) { diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h index 0ef8bcf..b61a9fa 100644 --- a/Source/cmExtraCodeBlocksGenerator.h +++ b/Source/cmExtraCodeBlocksGenerator.h @@ -35,10 +35,10 @@ public: virtual void SetGlobalGenerator(cmGlobalGenerator* generator); virtual const char* GetName() const - { return cmExtraCodeBlocksGenerator::GetActualName();} - static const char* GetActualName() { return "CodeBlocks";} + { return cmExtraCodeBlocksGenerator::GetActualName();} + static const char* GetActualName() { return "CodeBlocks";} static cmExternalMakefileProjectGenerator* New() - { return new cmExtraCodeBlocksGenerator; } + { return new cmExtraCodeBlocksGenerator; } /** Get the documentation entry for this generator. */ virtual void GetDocumentation(cmDocumentationEntry& entry, const char* fullName) const; diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index d9a2032..9330bb4 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -429,7 +429,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector const& args) std::string binaryFileName = this->Makefile->GetCurrentOutputDirectory(); binaryFileName += cmake::GetCMakeFilesDirectory(); binaryFileName += "/FileCommandStringsBinaryFile"; - if (cmHexFileConverter::TryConvert(fileName.c_str(), binaryFileName.c_str())) + if(cmHexFileConverter::TryConvert(fileName.c_str(),binaryFileName.c_str())) { fileName = binaryFileName; } diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 9af5352..d6532a8 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1144,7 +1144,8 @@ void cmGlobalGenerator::GetEnabledLanguages(std::vector& lang) int cmGlobalGenerator::GetLinkerPreference(const char* lang) { - std::map::const_iterator it = this->LanguageToLinkerPreference.find(lang); + std::map::const_iterator it = + this->LanguageToLinkerPreference.find(lang); if (it != this->LanguageToLinkerPreference.end()) { return it->second; @@ -1287,7 +1288,7 @@ cmTarget* cmGlobalGenerator::FindTarget(const char* project, for(unsigned int i = 0; i < gens->size(); ++i) { cmTarget* ret = (*gens)[i]->GetMakefile()->FindTarget(name, - useImportedTargets); + useImportedTargets); if(ret) { return ret; @@ -1551,9 +1552,10 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets) { cmCustomCommandLine localCmdLine = singleLine; - localCmdLine.insert(localCmdLine.begin()+1, "-DCMAKE_INSTALL_LOCAL_ONLY=1"); + localCmdLine.insert(localCmdLine.begin()+1, + "-DCMAKE_INSTALL_LOCAL_ONLY=1"); cpackCommandLines.erase(cpackCommandLines.begin(), - cpackCommandLines.end()); + cpackCommandLines.end()); cpackCommandLines.push_back(localCmdLine); (*targets)[install_local] = @@ -1684,7 +1686,7 @@ std::vector& cmGlobalGenerator // Don't emit the same utility twice for this target. if(emitted.insert(*util).second) { - cmTarget *target2 = target.GetMakefile()->FindTarget(util->c_str(), false); + cmTarget *target2=target.GetMakefile()->FindTarget(util->c_str(), false); // search each local generator until a match is found if (!target2) diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 540691f..e0def62 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -179,7 +179,9 @@ public: void FindMakeProgram(cmMakefile*); ///! Find a target by name by searching the local generators. - cmTarget* FindTarget(const char* project, const char* name, bool useImportedTargets); + cmTarget* FindTarget(const char* project, + const char* name, + bool useImportedTargets); /** If check to see if the target is linked to by any other target in the project */ @@ -218,7 +220,8 @@ public: // what targets does the specified target depend on std::vector& GetTargetDepends(cmTarget& target); - const std::map >& GetProjectMap() const {return this->ProjectMap;} + const std::map >& GetProjectMap() + const {return this->ProjectMap;} protected: void SetLanguageEnabledFlag(const char* l, cmMakefile* mf); void SetLanguageEnabledMaps(const char* l, cmMakefile* mf); diff --git a/Source/cmHexFileConverter.cxx b/Source/cmHexFileConverter.cxx index bf27383..6c89d82 100644 --- a/Source/cmHexFileConverter.cxx +++ b/Source/cmHexFileConverter.cxx @@ -153,7 +153,8 @@ static bool ConvertIntelHexLine(const char* buf, FILE* outFile) dataStart = 9; } // ignore extra address records - else if ((buf[8] == '2') || (buf[8] == '3') || (buf[8] == '4') || (buf[8] == '5')) + else if ((buf[8] == '2') || (buf[8] == '3') || (buf[8] == '4') + || (buf[8] == '5')) { return true; } diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx index 16847dc..d4c4c80 100644 --- a/Source/cmIncludeExternalMSProjectCommand.cxx +++ b/Source/cmIncludeExternalMSProjectCommand.cxx @@ -50,7 +50,9 @@ bool cmIncludeExternalMSProjectCommand cmSystemTools::ConvertToUnixSlashes(path); // Create a target instance for this utility. - cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY, utility_name.c_str(), false); + cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY, + utility_name.c_str(), + false); target->SetProperty("EXCLUDE_FROM_ALL","FALSE"); std::vector no_outputs; cmCustomCommandLines commandLines; diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0d8ebff..44940b4 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -939,7 +939,7 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target, if ( i != this->Targets.end()) { cmTarget* tgt = - this->GetCMakeInstance()->GetGlobalGenerator()->FindTarget(0, lib, false); + this->GetCMakeInstance()->GetGlobalGenerator()->FindTarget(0,lib,false); if(tgt) { bool allowModules = true; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 47fb955..d81da01 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -167,7 +167,9 @@ public: void AddDefineFlag(const char* definition); void RemoveDefineFlag(const char* definition); - cmTarget* AddNewTarget(cmTarget::TargetType type, const char* name, bool isImported); + cmTarget* AddNewTarget(cmTarget::TargetType type, + const char* name, + bool isImported); /** * Add an executable to the build. diff --git a/Source/cmTryCompileCommand.h b/Source/cmTryCompileCommand.h index 22dfd5e..12e24be 100644 --- a/Source/cmTryCompileCommand.h +++ b/Source/cmTryCompileCommand.h @@ -62,9 +62,9 @@ public: " TRY_COMPILE(RESULT_VAR bindir srcdir\n" " projectName [CMAKE_FLAGS ]\n" " [OUTPUT_VARIABLE var])\n" - "Try compiling a program. In this form, srcdir should contain a complete " - "CMake project with a CMakeLists.txt file and all sources. The bindir and " - "srcdir will not be deleted after this command is run. " + "Try compiling a program. In this form, srcdir should contain a " + "complete CMake project with a CMakeLists.txt file and all sources. The " + "bindir and srcdir will not be deleted after this command is run. " "If is specified then build just that target " "otherwise the all or ALL_BUILD target is built.\n" " TRY_COMPILE(RESULT_VAR bindir srcfile\n" diff --git a/Source/cmTryRunCommand.h b/Source/cmTryRunCommand.h index 8c4788c..a5400f5 100644 --- a/Source/cmTryRunCommand.h +++ b/Source/cmTryRunCommand.h @@ -102,8 +102,11 @@ public: cmTypeMacro(cmTryRunCommand, cmCoreTryCompile); private: - void RunExecutable(const std::string& runArgs, std::string* runOutputContents); - void DoNotRunExecutable(const std::string& runArgs, const std::string& srcFile, std::string* runOutputContents); + void RunExecutable(const std::string& runArgs, + std::string* runOutputContents); + void DoNotRunExecutable(const std::string& runArgs, + const std::string& srcFile, + std::string* runOutputContents); std::string CompileResultVariable; std::string RunResultVariable; diff --git a/Source/cmake.h b/Source/cmake.h index 03ee919..a089e95 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -336,7 +336,8 @@ protected: void AddDefaultCommands(); void AddDefaultGenerators(); void AddDefaultExtraGenerators(); - void AddExtraGenerator(const char* name, CreateExtraGeneratorFunctionType newFunction); + void AddExtraGenerator(const char* name, + CreateExtraGeneratorFunctionType newFunction); cmGlobalGenerator *GlobalGenerator; cmCacheManager *CacheManager; -- cgit v0.12