diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-05 14:49:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-05 14:49:58 (GMT) |
| commit | 4a4d62430be91f13588e62d71932d2f6332fcf2e (patch) | |
| tree | dc76518ad4372cd396868db4cd525abb58f2bdba /Source | |
| parent | ba8aa6899d69068cfc5d04a5d21552fe45a3380c (diff) | |
| parent | 4f2a983c21cb572ed92df76422bec20aecb3cec1 (diff) | |
| download | CMake-4a4d62430be91f13588e62d71932d2f6332fcf2e.zip CMake-4a4d62430be91f13588e62d71932d2f6332fcf2e.tar.gz CMake-4a4d62430be91f13588e62d71932d2f6332fcf2e.tar.bz2 | |
Merge topic 'cpack-dmg-explicit-hfs'
4f2a983c CPack: Fix PackageMaker .dmg HFS+ creation on macOS APFS hosts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1354
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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; |