[Cmake-commits] CMake branch, master, updated. v3.9.3-1044-g32a54d2

[Kitware Robot]

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, master has been updated
       via  32a54d23c0f1315a3593fd6efa073b8c7b33daae (commit)
       via  39b50975d9b6351ef82bbe16fc0aa521a5410e22 (commit)
      from  a9870c92118e242dfbc079aa1cea6a4214378e14 (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=32a54d23c0f1315a3593fd6efa073b8c7b33daae
commit 32a54d23c0f1315a3593fd6efa073b8c7b33daae
Merge: a9870c9 39b5097
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 2 14:24:40 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 2 10:24:45 2017 -0400

    Merge topic 'cpack-dmg-explicit-hfs'
    
    39b50975 CPack: Fix .dmg HFS+ creation on macOS APFS hosts
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1335


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39b50975d9b6351ef82bbe16fc0aa521a5410e22
commit 39b50975d9b6351ef82bbe16fc0aa521a5410e22
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 2 10:06:23 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 2 10:09:37 2017 -0400

    CPack: Fix .dmg HFS+ creation on macOS APFS hosts
    
    When running `hdiutil create`, specify the HFS+ filesystem explicitly.
    Otherwise `hdiutil` may choose a filesystem based on the host.  We do
    not want to create APFS images for `.dmg` packages because they may not
    mount on macOS versions prior to 10.12.

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 5a173fc..1e1543f 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -417,6 +417,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
   temp_image_command << " -ov";
   temp_image_command << " -srcfolder \"" << staging.str() << "\"";
   temp_image_command << " -volname \"" << cpack_dmg_volume_name << "\"";
+  temp_image_command << " -fs HFS+";
   temp_image_command << " -format " << temp_image_format;
   temp_image_command << " \"" << temp_image << "\"";
 
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index e75061e..8d3c40c 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -144,8 +144,8 @@ int cmCPackOSXX11Generator::PackageFiles()
   tmpFile += "/hdiutilOutput.log";
   std::ostringstream dmgCmd;
   dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM_DISK_IMAGE")
-         << "\" create -ov -format UDZO -srcfolder \"" << diskImageDirectory
-         << "\" \"" << packageFileNames[0] << "\"";
+         << "\" create -ov -fs HFS+ -format UDZO -srcfolder \""
+         << diskImageDirectory << "\" \"" << packageFileNames[0] << "\"";
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Compress disk image using command: "
                   << dmgCmd.str() << std::endl);
   // since we get random dashboard failures with this one

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

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


hooks/post-receive
-- 
CMake