diff --git a/Source/CPack/cmCPackGenericGenerator.cxx b/Source/CPack/cmCPackGenericGenerator.cxx index 4d34cd3d7..c0b978528 100644 --- a/Source/CPack/cmCPackGenericGenerator.cxx +++ b/Source/CPack/cmCPackGenericGenerator.cxx @@ -72,11 +72,13 @@ int cmCPackGenericGenerator::PrepareNames() this->SetOptionIfNotSet("CPACK_TEMPORARY_DIRECTORY", tempDirectory.c_str()); this->SetOptionIfNotSet("CPACK_OUTPUT_FILE_NAME", outName.c_str()); this->SetOptionIfNotSet("CPACK_OUTPUT_FILE_PATH", destFile.c_str()); - this->SetOptionIfNotSet("CPACK_TEMPORARY_PACKAGE_FILE_NAME", outFile.c_str()); + this->SetOptionIfNotSet("CPACK_TEMPORARY_PACKAGE_FILE_NAME", + outFile.c_str()); this->SetOptionIfNotSet("CPACK_INSTALL_DIRECTORY", this->GetInstallPath()); this->SetOptionIfNotSet("CPACK_NATIVE_INSTALL_DIRECTORY", cmsys::SystemTools::ConvertToOutputPath(this->GetInstallPath()).c_str()); - this->SetOptionIfNotSet("CPACK_TEMPORARY_INSTALL_DIRECTORY", installPrefix.c_str()); + this->SetOptionIfNotSet("CPACK_TEMPORARY_INSTALL_DIRECTORY", + installPrefix.c_str()); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for: CPACK_PACKAGE_DESCRIPTION_FILE" << std::endl); @@ -138,7 +140,8 @@ int cmCPackGenericGenerator::InstallProject() if ( cpackIgnoreFiles ) { std::vector ignoreFilesRegexString; - cmSystemTools::ExpandListArgument(cpackIgnoreFiles,ignoreFilesRegexString); + cmSystemTools::ExpandListArgument(cpackIgnoreFiles, + ignoreFilesRegexString); std::vector::iterator it; for ( it = ignoreFilesRegexString.begin(); it != ignoreFilesRegexString.end(); @@ -282,15 +285,17 @@ int cmCPackGenericGenerator::InstallProject() = this->GetOption("CPACK_INSTALL_CMAKE_PROJECTS"); const char* cmakeGenerator = this->GetOption("CPACK_CMAKE_GENERATOR"); - std::string currentWorkingDirectory = cmSystemTools::GetCurrentWorkingDirectory(); + std::string currentWorkingDirectory = + cmSystemTools::GetCurrentWorkingDirectory(); if ( cmakeProjects && *cmakeProjects ) { if ( !cmakeGenerator ) { cmCPackLogger(cmCPackLog::LOG_ERROR, - "CPACK_INSTALL_CMAKE_PROJECTS is specified, but CPACK_CMAKE_GENERATOR " - "is not. CPACK_CMAKE_GENERATOR is required to install the project." - << std::endl); + "CPACK_INSTALL_CMAKE_PROJECTS is specified, but " + "CPACK_CMAKE_GENERATOR is not. CPACK_CMAKE_GENERATOR " + "is required to install the project." + << std::endl); return 0; } std::vector cmakeProjectsVector; @@ -348,8 +353,12 @@ int cmCPackGenericGenerator::InstallProject() "- Run preinstall target for: " << installProjectName << std::endl); std::string output; int retVal = 1; - bool resB = cmSystemTools::RunSingleCommand(buildCommand.c_str(), &output, - &retVal, installDirectory.c_str(), this->GeneratorVerbose, 0); + bool resB = + cmSystemTools::RunSingleCommand(buildCommand.c_str(), + &output, + &retVal, + installDirectory.c_str(), + this->GeneratorVerbose, 0); if ( !resB || retVal ) { std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); @@ -394,7 +403,8 @@ int cmCPackGenericGenerator::InstallProject() = cmSystemTools::LowerCase(installComponent); if ( installComponentLowerCase != "all" ) { - mf->AddDefinition("CMAKE_INSTALL_COMPONENT", installComponent.c_str()); + mf->AddDefinition("CMAKE_INSTALL_COMPONENT", + installComponent.c_str()); } res = mf->ReadListFile(0, installFile.c_str()); @@ -469,8 +479,10 @@ int cmCPackGenericGenerator::InstallProject() stripCommand += fileName + "\""; int retVal = 1; std::string output; - bool resB = cmSystemTools::RunSingleCommand(stripCommand.c_str(), &output, - &retVal, 0, this->GeneratorVerbose, 0); + bool resB = + cmSystemTools::RunSingleCommand(stripCommand.c_str(), &output, + &retVal, 0, + this->GeneratorVerbose, 0); if ( !resB || retVal ) { cmCPackLogger(cmCPackLog::LOG_ERROR, diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 5f2541ffc..bac5d74c8 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -96,11 +96,13 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName, } cmCPackLogger(cmCPackLog::LOG_DEBUG, "Uninstall Dirs: " << dstr.str().c_str() << std::endl); - this->SetOptionIfNotSet("CPACK_NSIS_DELETE_DIRECTORIES", dstr.str().c_str()); + this->SetOptionIfNotSet("CPACK_NSIS_DELETE_DIRECTORIES", + dstr.str().c_str()); cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << nsisInFileName << " to " << nsisFileName << std::endl); - this->ConfigureFile(nsisInInstallOptions.c_str(), nsisInstallOptions.c_str()); + this->ConfigureFile(nsisInInstallOptions.c_str(), + nsisInstallOptions.c_str()); this->ConfigureFile(nsisInFileName.c_str(), nsisFileName.c_str()); std::string nsisCmd = "\""; nsisCmd += this->GetOption("CPACK_INSTALLER_PROGRAM"); @@ -227,7 +229,8 @@ int cmCPackNSISGenerator::InitializeInternal() << ".lnk\"" << std::endl; } this->SetOptionIfNotSet("CPACK_NSIS_CREATE_ICONS", str.str().c_str()); - this->SetOptionIfNotSet("CPACK_NSIS_DELETE_ICONS", deleteStr.str().c_str()); + this->SetOptionIfNotSet("CPACK_NSIS_DELETE_ICONS", + deleteStr.str().c_str()); } return this->Superclass::InitializeInternal(); diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index dff14139c..2413000c4 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -221,7 +221,8 @@ int cmCPackPackageMakerGenerator::InitializeInternal() << std::endl); return 0; } - this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM_DISK_IMAGE", pkgPath.c_str()); + this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM_DISK_IMAGE", + pkgPath.c_str()); return this->Superclass::InitializeInternal(); } diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index 5044d3a85..1766970fd 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -92,7 +92,8 @@ int cmCPackSTGZGenerator::GenerateHeader(std::ostream* os) { licenseText += line + "\n"; } - this->SetOptionIfNotSet("CPACK_RESOURCE_FILE_LICENSE_CONTENT", licenseText.c_str()); + this->SetOptionIfNotSet("CPACK_RESOURCE_FILE_LICENSE_CONTENT", + licenseText.c_str()); const char headerLengthTag[] = "###CPACK_HEADER_LENGTH###"; @@ -120,7 +121,8 @@ int cmCPackSTGZGenerator::GenerateHeader(std::ostream* os) ++ptr; } counter ++; - cmCPackLogger(cmCPackLog::LOG_DEBUG, "Number of lines: " << counter << std::endl); + cmCPackLogger(cmCPackLog::LOG_DEBUG, + "Number of lines: " << counter << std::endl); char buffer[1024]; sprintf(buffer, "%d", counter); cmSystemTools::ReplaceString(res, headerLengthTag, buffer); diff --git a/Source/CPack/cmCPackTarCompressGenerator.cxx b/Source/CPack/cmCPackTarCompressGenerator.cxx index 59527cdd5..b9110056f 100644 --- a/Source/CPack/cmCPackTarCompressGenerator.cxx +++ b/Source/CPack/cmCPackTarCompressGenerator.cxx @@ -74,7 +74,8 @@ int cmCPackTarCompressGenerator::CompressFiles(const char* outFileName, packageDirFileName += ".tar"; std::string output; int retVal = -1; - if ( !this->Superclass::CompressFiles(packageDirFileName.c_str(), toplevel, files) ) + if ( !this->Superclass::CompressFiles(packageDirFileName.c_str(), + toplevel, files) ) { return 0; } diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index effd78db9..ddd5252c6 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -245,7 +245,8 @@ int main (int argc, char *argv[]) { if ( cmSystemTools::FileExists(cpackConfigFile.c_str()) ) { - cpackConfigFile = cmSystemTools::CollapseFullPath(cpackConfigFile.c_str()); + cpackConfigFile = + cmSystemTools::CollapseFullPath(cpackConfigFile.c_str()); if ( !mf->ReadListFile(0, cpackConfigFile.c_str()) ) { cmCPack_Log(&log, cmCPackLog::LOG_ERROR,