diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx index 810307937..0a70d78c6 100644 --- a/Source/cmXCode21Object.cxx +++ b/Source/cmXCode21Object.cxx @@ -66,7 +66,8 @@ void cmXCode21Object::PrintList(std::vector const& v, cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXBuildStyle); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXContainerItemProxy); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXFileReference); - cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXFrameworksBuildPhase); + cmXCode21Object::PrintList(v, out, + cmXCode21Object::PBXFrameworksBuildPhase); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXGroup); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXHeadersBuildPhase); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXNativeTarget); @@ -76,7 +77,8 @@ void cmXCode21Object::PrintList(std::vector const& v, cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXResourcesBuildPhase); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXSourcesBuildPhase); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXCopyFilesBuildPhase); - cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXApplicationReference); + cmXCode21Object::PrintList(v, out, + cmXCode21Object::PBXApplicationReference); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXExecutableFileReference); cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXLibraryReference); diff --git a/Source/cmXCode21Object.h b/Source/cmXCode21Object.h index 7467dac74..752e22528 100644 --- a/Source/cmXCode21Object.h +++ b/Source/cmXCode21Object.h @@ -8,8 +8,10 @@ class cmXCode21Object : public cmXCodeObject public: cmXCode21Object(PBXType ptype, Type type); virtual void PrintComment(std::ostream&); - static void PrintList(std::vector const&, std::ostream& out, + static void PrintList(std::vector const&, + std::ostream& out, PBXType t); - static void PrintList(std::vector const&, std::ostream& out); + static void PrintList(std::vector const&, + std::ostream& out); }; #endif diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index bd0d8d69d..37d51a56a 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -39,7 +39,8 @@ cmXCodeObject::cmXCodeObject(PBXType ptype, Type type) } else { - this->Id = "Temporary cmake object, should not be refered to in xcode file"; + this->Id = + "Temporary cmake object, should not be refered to in xcode file"; } cmSystemTools::ReplaceString(this->Id, "0x", ""); this->Id = cmSystemTools::UpperCase(this->Id); @@ -73,7 +74,8 @@ void cmXCodeObject::Print(std::ostream& out) { std::string separator = "\n"; int indentFactor = 1; - if(this->Version > 15 && (this->IsA == PBXFileReference || this->IsA == PBXBuildFile)) + if(this->Version > 15 + && (this->IsA == PBXFileReference || this->IsA == PBXBuildFile)) { separator = " "; indentFactor = 0; @@ -92,7 +94,8 @@ void cmXCodeObject::Print(std::ostream& out) std::map::iterator i; cmXCodeObject::Indent(3*indentFactor, out); out << "isa = " << PBXTypeNames[this->IsA] << ";" << separator; - for(i = this->ObjectAttributes.begin(); i != this->ObjectAttributes.end(); ++i) + for(i = this->ObjectAttributes.begin(); + i != this->ObjectAttributes.end(); ++i) { cmXCodeObject* object = i->second; if(i->first != "isa") diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h index 04d1f93fe..9f000d16f 100644 --- a/Source/cmXCodeObject.h +++ b/Source/cmXCodeObject.h @@ -49,22 +49,25 @@ public: { this->List.push_back(value); } - bool HasObject(cmXCodeObject* o) - { - return !(std::find(this->List.begin(), this->List.end(), o) == this->List.end()); - } + bool HasObject(cmXCodeObject* o) + { + return !(std::find(this->List.begin(), this->List.end(), o) + == this->List.end()); + } void AddUniqueObject(cmXCodeObject* value) - { - if(std::find(this->List.begin(), this->List.end(), value) == this->List.end()) - { - this->List.push_back(value); - } - } + { + if(std::find(this->List.begin(), this->List.end(), value) + == this->List.end()) + { + this->List.push_back(value); + } + } static void Indent(int level, std::ostream& out); void Print(std::ostream& out); virtual void PrintComment(std::ostream&) {}; - static void PrintList(std::vector const&, std::ostream& out); + static void PrintList(std::vector const&, + std::ostream& out); const char* GetId() { return this->Id.c_str(); diff --git a/Source/cmXMLParser.h b/Source/cmXMLParser.h index cb9b9b7cf..2c34442ce 100644 --- a/Source/cmXMLParser.h +++ b/Source/cmXMLParser.h @@ -44,18 +44,20 @@ public: virtual int ParseFile(const char* file); /** - * When parsing fragments of XML or streaming XML, use the following three - * methods. InitializeParser method initialize parser but does not perform - * any actual parsing. ParseChunk parses framgent of XML. This has to match - * to what was already parsed. CleanupParser finishes parsing. If there were - * errors, CleanupParser will report them. + * When parsing fragments of XML or streaming XML, use the following + * three methods. InitializeParser method initialize parser but does + * not perform any actual parsing. ParseChunk parses framgent of + * XML. This has to match to what was already parsed. CleanupParser + * finishes parsing. If there were errors, CleanupParser will report + * them. */ virtual int InitializeParser(); virtual int ParseChunk(const char* inputString, unsigned int length); virtual int CleanupParser(); protected: - //! This variable is true if there was a parse error while parsing in chunks. + //! This variable is true if there was a parse error while parsing in + //chunks. int ParseError; //1 Expat parser structure. Exists only during call to Parse(). @@ -71,16 +73,15 @@ protected: virtual int ParsingComplete(); /** - * Called when a new element is opened in the XML source. Should be replaced - * by subclasses to handle each element. - * name = Name of new element. - * atts = Null-terminated array of attribute name/value pairs. Even - * indices are attribute names, and odd indices are values. + * Called when a new element is opened in the XML source. Should be + * replaced by subclasses to handle each element. name = Name of new + * element. atts = Null-terminated array of attribute name/value pairs. + * Even indices are attribute names, and odd indices are values. */ virtual void StartElement(const char* name, const char** atts); - //! Called at the end of an element in the XML source opened when StartElement - // was called. + //! Called at the end of an element in the XML source opened when + //StartElement was called. virtual void EndElement(const char* name); //! Called when there is character data to handle. diff --git a/Source/cmake.cxx b/Source/cmake.cxx index cc55aa418..189e15350 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1163,10 +1163,12 @@ void cmake::SetGlobalGenerator(cmGlobalGenerator *gg) // set the new this->GlobalGenerator = gg; - // set the global flag for unix style paths on cmSystemTools as - // soon as the generator is set. This allows gmake to be used - // on windows. - cmSystemTools::SetForceUnixPaths(this->GlobalGenerator->GetForceUnixPaths()); + + // set the global flag for unix style paths on cmSystemTools as soon as + // the generator is set. This allows gmake to be used on windows. + cmSystemTools::SetForceUnixPaths + (this->GlobalGenerator->GetForceUnixPaths()); + // Save the environment variables CXX and CC const char* cxx = getenv("CXX"); const char* cc = getenv("CC"); @@ -1287,7 +1289,8 @@ int cmake::Configure() // no generator specified on the command line if(!this->GlobalGenerator) { - const char* genName = this->CacheManager->GetCacheValue("CMAKE_GENERATOR"); + const char* genName = + this->CacheManager->GetCacheValue("CMAKE_GENERATOR"); if(genName) { this->GlobalGenerator = this->CreateGlobalGenerator(genName); @@ -2023,14 +2026,16 @@ const char* cmake::GetCTestCommand() #ifdef CMAKE_BUILD_WITH_CMAKE this->CTestCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); this->CTestCommand = removeQuotes(this->CTestCommand); - this->CTestCommand = cmSystemTools::GetFilenamePath(this->CTestCommand.c_str()); + this->CTestCommand = + cmSystemTools::GetFilenamePath(this->CTestCommand.c_str()); this->CTestCommand += "/"; this->CTestCommand += "ctest"; this->CTestCommand += cmSystemTools::GetExecutableExtension(); if(!cmSystemTools::FileExists(this->CTestCommand.c_str())) { this->CTestCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); - this->CTestCommand = cmSystemTools::GetFilenamePath(this->CTestCommand.c_str()); + this->CTestCommand = + cmSystemTools::GetFilenamePath(this->CTestCommand.c_str()); this->CTestCommand += "/Debug/"; this->CTestCommand += "ctest"; this->CTestCommand += cmSystemTools::GetExecutableExtension(); @@ -2038,7 +2043,8 @@ const char* cmake::GetCTestCommand() if(!cmSystemTools::FileExists(this->CTestCommand.c_str())) { this->CTestCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); - this->CTestCommand = cmSystemTools::GetFilenamePath(this->CTestCommand.c_str()); + this->CTestCommand = + cmSystemTools::GetFilenamePath(this->CTestCommand.c_str()); this->CTestCommand += "/Release/"; this->CTestCommand += "ctest"; this->CTestCommand += cmSystemTools::GetExecutableExtension(); @@ -2070,14 +2076,16 @@ const char* cmake::GetCPackCommand() #ifdef CMAKE_BUILD_WITH_CMAKE this->CPackCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); this->CPackCommand = removeQuotes(this->CPackCommand); - this->CPackCommand = cmSystemTools::GetFilenamePath(this->CPackCommand.c_str()); + this->CPackCommand = + cmSystemTools::GetFilenamePath(this->CPackCommand.c_str()); this->CPackCommand += "/"; this->CPackCommand += "cpack"; this->CPackCommand += cmSystemTools::GetExecutableExtension(); if(!cmSystemTools::FileExists(this->CPackCommand.c_str())) { this->CPackCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); - this->CPackCommand = cmSystemTools::GetFilenamePath(this->CPackCommand.c_str()); + this->CPackCommand = + cmSystemTools::GetFilenamePath(this->CPackCommand.c_str()); this->CPackCommand += "/Debug/"; this->CPackCommand += "cpack"; this->CPackCommand += cmSystemTools::GetExecutableExtension(); @@ -2085,7 +2093,8 @@ const char* cmake::GetCPackCommand() if(!cmSystemTools::FileExists(this->CPackCommand.c_str())) { this->CPackCommand = mf->GetRequiredDefinition("CMAKE_COMMAND"); - this->CPackCommand = cmSystemTools::GetFilenamePath(this->CPackCommand.c_str()); + this->CPackCommand = + cmSystemTools::GetFilenamePath(this->CPackCommand.c_str()); this->CPackCommand += "/Release/"; this->CPackCommand += "cpack"; this->CPackCommand += cmSystemTools::GetExecutableExtension(); @@ -2201,8 +2210,6 @@ void cmake::GenerateGraphViz(const char* fileName) sprintf(tgtName, "%s%d", graphNodePrefix, cnt++); targetNamesNodes[realTargetName] = tgtName; targetPtrs[realTargetName] = &tit->second; - //str << " \"" << tgtName << "\" [ label=\"" << tit->first.c_str() - //<< "\" shape=\"box\"];" << std::endl; } } // Ok, now find all the stuff we link to that is not in cmake diff --git a/Source/cmake.h b/Source/cmake.h index 18d2587b8..b2cea7bde 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -243,9 +243,9 @@ class cmake int DoPreConfigureChecks(); /** - * Set and get the script mode option. In script mode there is no generator - * and no cache. Also, language are not enabled, so add_executable and things - * do not do anything. + * Set and get the script mode option. In script mode there is no + * generator and no cache. Also, language are not enabled, so + * add_executable and things do not do anything. */ void SetScriptMode(bool mode) { this->ScriptMode = mode; } bool GetScriptMode() { return this->ScriptMode; } @@ -311,7 +311,8 @@ protected: void SetDirectoriesFromFile(const char* arg); - //! Make sure all commands are what they say they are and there is no macros. + //! Make sure all commands are what they say they are and there is no + //macros. void CleanupCommandsAndMacros(); void GenerateGraphViz(const char* fileName); @@ -366,7 +367,8 @@ private: {0, \ "CMake is a cross-platform build system generator. Projects " \ "specify their build process with platform-independent CMake listfiles " \ - "included in each directory of a source tree with the name CMakeLists.txt. "\ + "included in each directory of a source tree with the name " \ + "CMakeLists.txt. " \ "Users build a project by using CMake to generate a build system " \ "for a native tool on their platform.", 0} #endif diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 039108d4e..bb01116f3 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -45,7 +45,8 @@ static const cmDocumentationEntry cmDocumentationDescription[] = { {0, "The \"cmake\" executable is the CMake command-line interface. It may " - "be used to configure projects in scripts. Project configuration settings " + "be used to configure projects in scripts. Project configuration " + "settings " "may be specified on the command line with the -D option. The -i option " "will cause cmake to interactively prompt for such settings.", 0}, CMAKE_STANDARD_INTRODUCTION,