[Cmake-commits] CMake branch, master, updated. v3.9.4-1085-g4a4d624

[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  4a4d62430be91f13588e62d71932d2f6332fcf2e (commit)
       via  4f2a983c21cb572ed92df76422bec20aecb3cec1 (commit)
      from  ba8aa6899d69068cfc5d04a5d21552fe45a3380c (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=4a4d62430be91f13588e62d71932d2f6332fcf2e
commit 4a4d62430be91f13588e62d71932d2f6332fcf2e
Merge: ba8aa68 4f2a983
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 5 14:49:55 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 5 10:49:58 2017 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f2a983c21cb572ed92df76422bec20aecb3cec1
commit 4f2a983c21cb572ed92df76422bec20aecb3cec1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 5 10:30:34 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 5 10:33:13 2017 -0400

    CPack: Fix PackageMaker .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.
    
    This was missed in commit 39b50975d9 (CPack: Fix .dmg HFS+ creation on
    macOS APFS hosts, 2017-10-02).
    
    Reported-by: Alan Garny

diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 0299279..dbcb022 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -288,8 +288,8 @@ int cmCPackPackageMakerGenerator::PackageFiles()
   tmpFile += "/hdiutilOutput.log";
   std::ostringstream dmgCmd;
   dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM_DISK_IMAGE")
-         << "\" create -ov -format UDZO -srcfolder \"" << packageDirFileName
-         << "\" \"" << packageFileNames[0] << "\"";
+         << "\" create -ov -fs HFS+ -format UDZO -srcfolder \""
+         << packageDirFileName << "\" \"" << packageFileNames[0] << "\"";
   std::string output;
   int retVal = 1;
   int numTries = 10;

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

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


hooks/post-receive
-- 
CMake