diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-02 14:24:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-02 14:24:45 (GMT) |
| commit | 32a54d23c0f1315a3593fd6efa073b8c7b33daae (patch) | |
| tree | ff48f2624498c4625c43322b4ba08f093c817e97 | |
| parent | a9870c92118e242dfbc079aa1cea6a4214378e14 (diff) | |
| parent | 39b50975d9b6351ef82bbe16fc0aa521a5410e22 (diff) | |
| download | CMake-32a54d23c0f1315a3593fd6efa073b8c7b33daae.zip CMake-32a54d23c0f1315a3593fd6efa073b8c7b33daae.tar.gz CMake-32a54d23c0f1315a3593fd6efa073b8c7b33daae.tar.bz2 | |
Merge topic 'cpack-dmg-explicit-hfs'
39b50975 CPack: Fix .dmg HFS+ creation on macOS APFS hosts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1335
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/CPack/cmCPackOSXX11Generator.cxx | 4 |
2 files changed, 3 insertions, 2 deletions
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 |