summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackGenericGenerator.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-05-12 18:44:24 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-05-12 18:44:24 (GMT)
commitaf04164c6d7171b38c38fff3cb96fb73f7451e74 (patch)
tree21747e1e20f3e808481e65f17b4f3b0d8a60f520 /Source/CPack/cmCPackGenericGenerator.cxx
parentbf5ed9b27b5ce80348de2ec283c7c13893a00360 (diff)
downloadCMake-af04164c6d7171b38c38fff3cb96fb73f7451e74.zip
CMake-af04164c6d7171b38c38fff3cb96fb73f7451e74.tar.gz
CMake-af04164c6d7171b38c38fff3cb96fb73f7451e74.tar.bz2
STYLE: fix line length
Diffstat (limited to 'Source/CPack/cmCPackGenericGenerator.cxx')
-rw-r--r--Source/CPack/cmCPackGenericGenerator.cxx36
1 files changed, 24 insertions, 12 deletions
diff --git a/Source/CPack/cmCPackGenericGenerator.cxx b/Source/CPack/cmCPackGenericGenerator.cxx
index 4d34cd3..c0b9785 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<std::string> ignoreFilesRegexString;
- cmSystemTools::ExpandListArgument(cpackIgnoreFiles,ignoreFilesRegexString);
+ cmSystemTools::ExpandListArgument(cpackIgnoreFiles,
+ ignoreFilesRegexString);
std::vector<std::string>::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<std::string> 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,