From 71fee8522efe9eccf1abd3b84239732d4125d442 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 2 Oct 2008 09:18:47 -0400 Subject: STYLE: fix line length issues --- Source/CPack/cmCPackBundleGenerator.cxx | 6 ++++-- Source/CPack/cmCPackGenerator.cxx | 14 ++++++++------ Source/CTest/cmProcess.cxx | 18 +++++++++++------- Source/cmFindCommon.cxx | 10 +++++++++- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx index 710c412..5a4ebd1 100644 --- a/Source/CPack/cmCPackBundleGenerator.cxx +++ b/Source/CPack/cmCPackBundleGenerator.cxx @@ -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; diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index ab2ae32..479db4f 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -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: " diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 97a1030..0d2635d 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -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: { diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 45ee91a..2f7a515 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -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 tmp; cmSystemTools::GetPath(tmp, variable); - + for(std::vector::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); -- cgit v0.12