kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Remove warnings and style problems

This commit is contained in:
Andy Cedilnik 2006-07-10 07:59:05 -04:00
parent 17eddbd521
commit e918403eee
1 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/CPack/cmCPackGenericGenerator.cxx
View File

@ -178,7 +178,8 @@ int cmCPackGenericGenerator::InstallProject()
// If the CPackConfig file sets CPACK_INSTALL_COMMANDS then run them
// as listed
if ( !this->InstallProjectViaInstallCommands(movable, tempInstallDirectory) )
if ( !this->InstallProjectViaInstallCommands(
movable, tempInstallDirectory) )
{
return 0;
}
@ -186,7 +187,8 @@ int cmCPackGenericGenerator::InstallProject()
// If the CPackConfig file sets CPACK_INSTALLED_DIRECTORIES
// then glob it and copy it to CPACK_TEMPORARY_DIRECTORY
// This is used in Source packageing
if ( !this->InstallProjectViaInstalledDirectories(movable, tempInstallDirectory) )
if ( !this->InstallProjectViaInstalledDirectories(
movable, tempInstallDirectory) )
{
return 0;
}
@ -194,7 +196,8 @@ int cmCPackGenericGenerator::InstallProject()
// If the project is a CMAKE project then run pre-install
// and then read the cmake_install script to run it
if ( !this->InstallProjectViaInstallCMakeProjects(movable, tempInstallDirectory) )
if ( !this->InstallProjectViaInstallCMakeProjects(
movable, tempInstallDirectory) )
{
return 0;
}
@ -247,8 +250,11 @@ int cmCPackGenericGenerator::InstallProject()
}
//----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProjectViaInstallCommands(bool movable, const char* tempInstallDirectory)
int cmCPackGenericGenerator::InstallProjectViaInstallCommands(
bool movable, const char* tempInstallDirectory)
{
(void)movable;
(void)tempInstallDirectory;
const char* installCommands = this->GetOption("CPACK_INSTALL_COMMANDS");
if ( installCommands && *installCommands )
{
@ -285,8 +291,11 @@ int cmCPackGenericGenerator::InstallProjectViaInstallCommands(bool movable, cons
}
//----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories(bool movable, const char* tempInstallDirectory)
int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories(
bool movable, const char* tempInstallDirectory)
{
(void)movable;
(void)tempInstallDirectory;
std::vector<cmsys::RegularExpression> ignoreFilesRegex;
const char* cpackIgnoreFiles = this->GetOption("CPACK_IGNORE_FILES");
if ( cpackIgnoreFiles )
@ -382,7 +391,8 @@ int cmCPackGenericGenerator::InstallProjectViaInstalledDirectories(bool movable,
}
//----------------------------------------------------------------------
int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects(bool movable, const char* tempInstallDirectory)
int cmCPackGenericGenerator::InstallProjectViaInstallCMakeProjects(
bool movable, const char* tempInstallDirectory)
{
const char* cmakeProjects
= this->GetOption("CPACK_INSTALL_CMAKE_PROJECTS");
@ -559,9 +569,11 @@ int cmCPackGenericGenerator::ProcessGenerator()
{
return 0;
}
if ( cmSystemTools::IsOn(this->GetOption("CPACK_REMOVE_TOPLEVEL_DIRECTORY")) )
if ( cmSystemTools::IsOn(
this->GetOption("CPACK_REMOVE_TOPLEVEL_DIRECTORY")) )
{
const char* toplevelDirectory = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
const char* toplevelDirectory
= this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
if ( cmSystemTools::FileExists(toplevelDirectory) )
{
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Remove toplevel directory: "