[Cmake-commits] [cmake-commits] hoffman committed cmCPackBundleGenerator.cxx 1.4 1.5 cmCPackGenerator.cxx 1.14 1.15

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv10955/CPack

Modified Files:
	cmCPackBundleGenerator.cxx cmCPackGenerator.cxx 
Log Message:
STYLE: fix line length issues


Index: cmCPackBundleGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackBundleGenerator.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmCPackBundleGenerator.cxx	1 Oct 2008 13:04:27 -0000	1.4
--- cmCPackBundleGenerator.cxx	2 Oct 2008 13:18:47 -0000	1.5
***************
*** 188,192 ****
      {
      cmCPackLogger(cmCPackLog::LOG_ERROR,
!       "Error copying startup command.  Check the value of CPACK_BUNDLE_STARTUP_COMMAND."
        << std::endl);
  
--- 188,193 ----
      {
      cmCPackLogger(cmCPackLog::LOG_ERROR,
!                   "Error copying startup command. "
!                   " Check the value of CPACK_BUNDLE_STARTUP_COMMAND."
        << std::endl);
  
***************
*** 215,219 ****
        {
        cmCPackLogger(cmCPackLog::LOG_ERROR,
!         "Error copying disk volume icon.  Check the value of CPACK_PACKAGE_ICON."
          << std::endl);
  
--- 216,221 ----
        {
        cmCPackLogger(cmCPackLog::LOG_ERROR,
!         "Error copying disk volume icon.  "
!                     "Check the value of CPACK_PACKAGE_ICON."
          << std::endl);
  

Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** cmCPackGenerator.cxx	1 Oct 2008 13:04:27 -0000	1.14
--- cmCPackGenerator.cxx	2 Oct 2008 13:18:47 -0000	1.15
***************
*** 643,650 ****
          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.
            std::string dir;
            if (this->GetOption("CPACK_INSTALL_PREFIX"))
--- 643,650 ----
          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.
            std::string dir;
            if (this->GetOption("CPACK_INSTALL_PREFIX"))
***************
*** 672,678 ****
          else
            {
!           mf->AddDefinition("CMAKE_INSTALL_PREFIX", tempInstallDirectory.c_str());
  
!           if ( !cmsys::SystemTools::MakeDirectory(tempInstallDirectory.c_str()))
              {
              cmCPackLogger(cmCPackLog::LOG_ERROR,
--- 672,680 ----
          else
            {
!           mf->AddDefinition("CMAKE_INSTALL_PREFIX",
!                             tempInstallDirectory.c_str());
  
!           if ( !cmsys::SystemTools::MakeDirectory(
!                  tempInstallDirectory.c_str()))
              {
              cmCPackLogger(cmCPackLog::LOG_ERROR,