Commit 4f2a983c authored by Brad King's avatar Brad King
Browse files

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 39b50975 (CPack: Fix .dmg HFS+ creation on
macOS APFS hosts, 2017-10-02).

Reported-by: Alan Garny
parent 39b50975
Pipeline #75575 passed with stage
...@@ -288,8 +288,8 @@ int cmCPackPackageMakerGenerator::PackageFiles() ...@@ -288,8 +288,8 @@ int cmCPackPackageMakerGenerator::PackageFiles()
tmpFile += "/hdiutilOutput.log"; tmpFile += "/hdiutilOutput.log";
std::ostringstream dmgCmd; std::ostringstream dmgCmd;
dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM_DISK_IMAGE") dmgCmd << "\"" << this->GetOption("CPACK_INSTALLER_PROGRAM_DISK_IMAGE")
<< "\" create -ov -format UDZO -srcfolder \"" << packageDirFileName << "\" create -ov -fs HFS+ -format UDZO -srcfolder \""
<< "\" \"" << packageFileNames[0] << "\""; << packageDirFileName << "\" \"" << packageFileNames[0] << "\"";
std::string output; std::string output;
int retVal = 1; int retVal = 1;
int numTries = 10; int numTries = 10;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment