diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-01-17 13:32:48 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-17 08:33:01 -0500 |
| commit | 808888aa47377b7caa7b199975e927ab6a004840 (patch) | |
| tree | 04ade2c87f78d4d6526b265bc707a0798df42e19 /Source/CPack | |
| parent | c9836f8a886daf10e46d068d736c56c78d94de6a (diff) | |
| parent | 6d6f4b93164313ae8f6dfbaabc579c48732c2769 (diff) | |
| download | cmake-808888aa47377b7caa7b199975e927ab6a004840.tar.gz | |
Merge topic 'cpack-custom-dmg-names'
6d6f4b9316 CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME
b53230fbee Tests: Add DragNDrop as a testable CPack generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4227
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index ea7100708f..3516235810 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -775,6 +775,11 @@ std::string cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix( } } + std::string componentFileName = + "CPACK_DMG_" + cmSystemTools::UpperCase(componentName) + "_FILE_NAME"; + if (this->IsSet(componentFileName)) { + return this->GetOption(componentFileName); + } return GetComponentPackageFileName(package_file_name, componentName, false); } |