diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-10-01 13:04:27 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-10-01 13:04:27 (GMT) |
commit | ecf312ccc87ae455267df27ad5cbe2c031e9ef18 (patch) | |
tree | 4aa28cac73526043f0e7886cc993f0c773ad87c2 /Source/CPack/cmCPackPackageMakerGenerator.cxx | |
parent | 8a704d5686280ab804f03e48a180ff871422609f (diff) | |
download | CMake-ecf312ccc87ae455267df27ad5cbe2c031e9ef18.zip CMake-ecf312ccc87ae455267df27ad5cbe2c031e9ef18.tar.gz CMake-ecf312ccc87ae455267df27ad5cbe2c031e9ef18.tar.bz2 |
STYLE: fix line length stuff for KWStyle
Diffstat (limited to 'Source/CPack/cmCPackPackageMakerGenerator.cxx')
-rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 049a6e4..96a60c8 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -179,7 +179,8 @@ int cmCPackPackageMakerGenerator::CompressFiles(const char* outFileName, // Create the directory where downloaded component packages will // be placed. - const char* userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY"); + const char* userUploadDirectory = + this->GetOption("CPACK_UPLOAD_DIRECTORY"); std::string uploadDirectory; if (userUploadDirectory && *userUploadDirectory) { @@ -222,15 +223,20 @@ int cmCPackPackageMakerGenerator::CompressFiles(const char* outFileName, { if (this->PackageCompatibilityVersion < 10.5) { - cmCPackLogger(cmCPackLog::LOG_WARNING, - "CPack warning: please set CPACK_OSX_PACKAGE_VERSION to 10.5 or greater enable downloaded packages. CPack will build a non-downloaded package." - << std::endl); + cmCPackLogger( + cmCPackLog::LOG_WARNING, + "CPack warning: please set CPACK_OSX_PACKAGE_VERSION to 10.5 " + "or greater enable downloaded packages. CPack will build a " + "non-downloaded package." + << std::endl); } if (this->PackageMakerVersion < 3) { cmCPackLogger(cmCPackLog::LOG_WARNING, - "CPack warning: unable to build downloaded packages with PackageMaker versions prior to 3.0. CPack will build a non-downloaded package." + "CPack warning: unable to build downloaded " + "packages with PackageMaker versions prior " + "to 3.0. CPack will build a non-downloaded package." << std::endl); } @@ -605,7 +611,8 @@ GenerateComponentPackage(const char *packageFile, const cmCPackComponent& component) { cmCPackLogger(cmCPackLog::LOG_OUTPUT, - "- Building component package: " << packageFile << std::endl); + "- Building component package: " << + packageFile << std::endl); // The command that will be used to run PackageMaker cmOStringStream pkgCmd; @@ -638,7 +645,8 @@ GenerateComponentPackage(const char *packageFile, // Create the Info.plist file for this component std::string moduleVersionSuffix = "."; moduleVersionSuffix += component.Name; - this->SetOption("CPACK_MODULE_VERSION_SUFFIX", moduleVersionSuffix.c_str()); + this->SetOption("CPACK_MODULE_VERSION_SUFFIX", + moduleVersionSuffix.c_str()); std::string infoFileName = component.Name; infoFileName += "-Info.plist"; if (!this->CopyResourcePlistFile("Info.plist", infoFileName.c_str())) @@ -801,7 +809,8 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, out << "<choice id=\"" << component.Name << "Choice\" " << "title=\"" << component.DisplayName << "\" " << "start_selected=\"" - << (component.IsDisabledByDefault && !component.IsRequired? "false" : "true") + << (component.IsDisabledByDefault && + !component.IsRequired? "false" : "true") << "\" " << "start_enabled=\"" << (component.IsRequired? "false" : "true") @@ -812,7 +821,8 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, out << "description=\"" << EscapeForXML(component.Description) << "\" "; } - if (!component.Dependencies.empty() || !component.ReverseDependencies.empty()) + if (!component.Dependencies.empty() || + !component.ReverseDependencies.empty()) { // The "selected" expression is evaluated each time any choice is // selected, for all choices *except* the one that the user @@ -885,7 +895,8 @@ AddDependencyAttributes(const cmCPackComponent& component, dependIt != component.Dependencies.end(); ++dependIt) { - out << " && choices['" << (*dependIt)->Name << "Choice'].selected"; + out << " && choices['" << + (*dependIt)->Name << "Choice'].selected"; AddDependencyAttributes(**dependIt, visited, out); } } |