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

STYLE: fix line length issues

This commit is contained in:
Bill Hoffman 2008-10-02 09:18:47 -04:00
parent efd096118f
commit 71fee8522e
4 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CPack/cmCPackBundleGenerator.cxx
View File

@ -187,7 +187,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName,
if(!this->CopyFile(command_source, command_target))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error copying startup command. Check the value of CPACK_BUNDLE_STARTUP_COMMAND."
"Error copying startup command. "
" Check the value of CPACK_BUNDLE_STARTUP_COMMAND."
<< std::endl);
return 0;
@ -214,7 +215,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName,
if(!this->CopyFile(package_icon_source, package_icon_destination))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error copying disk volume icon. Check the value of CPACK_PACKAGE_ICON."
"Error copying disk volume icon. "
"Check the value of CPACK_PACKAGE_ICON."
<< std::endl);
return 0;

14
Source/CPack/cmCPackGenerator.cxx
View File

@ -642,10 +642,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
if ( setDestDir )
{
// For DESTDIR based packaging, use the *project* CMAKE_INSTALL_PREFIX
// underneath the tempInstallDirectory. The value of the project's
// CMAKE_INSTALL_PREFIX is sent in here as the value of the
// CPACK_INSTALL_PREFIX variable.
// For DESTDIR based packaging, use the *project*
// CMAKE_INSTALL_PREFIX underneath the tempInstallDirectory. The
// value of the project's CMAKE_INSTALL_PREFIX is sent in here as
// the value of the CPACK_INSTALL_PREFIX variable.
std::string dir;
if (this->GetOption("CPACK_INSTALL_PREFIX"))
{
@ -671,9 +671,11 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
}
else
{
mf->AddDefinition("CMAKE_INSTALL_PREFIX", tempInstallDirectory.c_str());
mf->AddDefinition("CMAKE_INSTALL_PREFIX",
tempInstallDirectory.c_str());
if ( !cmsys::SystemTools::MakeDirectory(tempInstallDirectory.c_str()))
if ( !cmsys::SystemTools::MakeDirectory(
tempInstallDirectory.c_str()))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Problem creating temporary directory: "

18
Source/CTest/cmProcess.cxx
View File

@ -226,9 +226,10 @@ int cmProcess::ReportStatus()
} break;
case cmsysProcess_State_Error:
{
std::cerr << "cmProcess: Error executing " << this->Command << " process: "
<< cmsysProcess_GetErrorString(this->Process)
<< "\n";
std::cerr << "cmProcess: Error executing " << this->Command
<< " process: "
<< cmsysProcess_GetErrorString(this->Process)
<< "\n";
} break;
case cmsysProcess_State_Exception:
{
@ -265,17 +266,20 @@ int cmProcess::ReportStatus()
} break;
case cmsysProcess_State_Executing:
{
std::cerr << "cmProcess: Never terminated " << this->Command << " process.\n";
std::cerr << "cmProcess: Never terminated " <<
this->Command << " process.\n";
} break;
case cmsysProcess_State_Exited:
{
result = cmsysProcess_GetExitValue(this->Process);
std::cerr << "cmProcess: " << this->Command << " process exited with code "
<< result << "\n";
std::cerr << "cmProcess: " << this->Command
<< " process exited with code "
<< result << "\n";
} break;
case cmsysProcess_State_Expired:
{
std::cerr << "cmProcess: killed " << this->Command << " process due to timeout.\n";
std::cerr << "cmProcess: killed " << this->Command
<< " process due to timeout.\n";
} break;
case cmsysProcess_State_Killed:
{

10
Source/cmFindCommon.cxx
View File

@ -372,10 +372,18 @@ void cmFindCommon::AddCMakePath(const char* variable)
//----------------------------------------------------------------------------
void cmFindCommon::AddEnvPath(const char* variable)
{
if(variable)
{
std::cerr << variable << "\n";
}
// Get a path from the environment.
std::vector<std::string> tmp;
cmSystemTools::GetPath(tmp, variable);
for(std::vector<std::string>::iterator i = tmp.begin();
i != tmp.end(); ++i)
{
std::cerr << i->c_str() << "\n";
}
// Relative paths are interpreted with respect to the current
// working directory.
this->AddPathsInternal(tmp, EnvPath);