summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-05 10:40:37 -0400
committerBrad King <brad.king@kitware.com>2017-10-05 10:40:37 -0400
commitecaddda2fea374089d867ad17b8b4700b189f397 (patch)
treea52bfa1a0baf1e3931cf9b7c15d43b06870c1955
parent05373ee1a2f53302a84a6900ea25244e9724f665 (diff)
parent4f2a983c21cb572ed92df76422bec20aecb3cec1 (diff)
downloadcmake-ecaddda2fea374089d867ad17b8b4700b189f397.tar.gz
Merge branch 'cpack-dmg-explicit-hfs' into release-3.10v3.10.0-rc1
Merge-request: !1354
-rw-r--r--Source/CPack/cmCPackPackageMakerGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 02992790e9..dbcb022318 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;