[Cmake-commits] CMake branch, next, updated. v3.4.0-rc3-1311-gc226294

[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  c2262942c2a24f088f22b9089e37a2e256d85d7c (commit)
       via  93a4cb7f76b162ad29b4d796660395d621b23223 (commit)
      from  3ac922460dbb6221d1fe0702b4eb305c84dc478e (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=c2262942c2a24f088f22b9089e37a2e256d85d7c
commit c2262942c2a24f088f22b9089e37a2e256d85d7c
Merge: 3ac9224 93a4cb7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 11 14:59:31 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 11 14:59:31 2015 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93a4cb7f76b162ad29b4d796660395d621b23223
commit 93a4cb7f76b162ad29b4d796660395d621b23223
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 11 14:55:53 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 11 14:55:53 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 3b46c1f..6e7093c 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -440,6 +440,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
   unsigned long dmgSize = compute_folder_content_size( staging_path );
   if (!cpack_dmg_background_image.empty())
     {
+    dmgSize += 4096; // extra 4k per entry as in compute_folder_content_size
     dmgSize += cmSystemTools::FileLength(cpack_dmg_background_image.c_str());
     }
   dmgSize += 8569344; //add ~8MB for the DS_Store and buffer

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

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake