diff options
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackBundleGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 14 |
2 files changed, 12 insertions, 8 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: " |