mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 01:49:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpack-dmg-no-app-link'

Browse Source 
3acc29fc CPack/DragNDrop: Optionally disable `/Applications` symlink
This commit is contained in:
Brad King
2016-05-26 09:52:07 -04:00
committed by CMake Topic Stage
parent 903bcbc39e 3acc29fca9
commit 579185be7a
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackDragNDropGenerator.cxx
+10 -5
View File
@@ -305,6 +305,9 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
? this->GetOption("CPACK_DMG_DS_STORE_SETUP_SCRIPT")
: "";
const bool cpack_dmg_disable_applications_symlink =
this->IsOn("CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK");
// only put license on dmg if is user provided
if (!cpack_license_file.empty() &&
cpack_license_file.find("CPack.GenericLicense.txt") !=
@@ -323,11 +326,13 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
staging << src_dir;
// Add a symlink to /Applications so users can drag-and-drop the bundle
// into it
std::ostringstream application_link;
application_link << staging.str() << "/Applications";
cmSystemTools::CreateSymlink("/Applications",
application_link.str().c_str());
// into it unless this behaviour was disabled
if (!cpack_dmg_disable_applications_symlink) {
std::ostringstream application_link;
application_link << staging.str() << "/Applications";
cmSystemTools::CreateSymlink("/Applications",
application_link.str().c_str());
}
// Optionally add a custom volume icon ...
if (!cpack_package_icon.empty()) {