[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1309-g3ac9224

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3ac922460dbb6221d1fe0702b4eb305c84dc478e (commit)
       via  542875b07de07a9ce2289a02cc576976898f3df1 (commit)
      from  64f4259b199f471715c484663bd08e288a74bafa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac922460dbb6221d1fe0702b4eb305c84dc478e
commit 3ac922460dbb6221d1fe0702b4eb305c84dc478e
Merge: 64f4259 542875b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 10 15:58:44 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 10 15:58:44 2015 -0500

    Merge topic 'better_looking_mac_package' into next
    
    542875b0 fixup! DragNDropGenerator now manually computes the size of the temp dmg


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=542875b07de07a9ce2289a02cc576976898f3df1
commit 542875b07de07a9ce2289a02cc576976898f3df1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 10 15:57:46 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 10 15:57:46 2015 -0500

    fixup! DragNDropGenerator now manually computes the size of the temp dmg

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 9a75b25..3b46c1f 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -442,12 +442,12 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
     {
     dmgSize += cmSystemTools::FileLength(cpack_dmg_background_image.c_str());
     }
-  dmgSize += 8388608; //add 8MB for the DS_Store and buffer
+  dmgSize += 8569344; //add ~8MB for the DS_Store and buffer
 
   //now that we have computed the size of the disk image we need to convert
   //it to kb. The reason for this is that the hdiutil doesn't have a byte
   //size specifier.
-  const unsigned long dmgSizeAsKB = dmgSize / 1024;
+  const unsigned long dmgSizeAsKB = (dmgSize + 1023) / 1024;
 
   std::string temp_image = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
   temp_image += "/temp.dmg";

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake