diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-01-17 13:32:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-17 13:33:01 (GMT) |
| commit | 808888aa47377b7caa7b199975e927ab6a004840 (patch) | |
| tree | 04ade2c87f78d4d6526b265bc707a0798df42e19 /Tests/RunCMake/CPack/tests | |
| parent | c9836f8a886daf10e46d068d736c56c78d94de6a (diff) | |
| parent | 6d6f4b93164313ae8f6dfbaabc579c48732c2769 (diff) | |
| download | CMake-808888aa47377b7caa7b199975e927ab6a004840.zip CMake-808888aa47377b7caa7b199975e927ab6a004840.tar.gz CMake-808888aa47377b7caa7b199975e927ab6a004840.tar.bz2 | |
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 'Tests/RunCMake/CPack/tests')
| -rw-r--r-- | Tests/RunCMake/CPack/tests/CUSTOM_NAMES/ExpectedFiles.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/ExpectedFiles.cmake index 07226df..9ac19e2 100644 --- a/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/ExpectedFiles.cmake +++ b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/ExpectedFiles.cmake @@ -12,4 +12,7 @@ if(GENERATOR_TYPE STREQUAL "DEB" OR GENERATOR_TYPE STREQUAL "RPM") elseif(GENERATOR_TYPE STREQUAL "TGZ") set(EXPECTED_FILE_2 "second.tar.gz") set(EXPECTED_FILE_3 "pkg_3_abc.tar.gz") +elseif(GENERATOR_TYPE STREQUAL "DragNDrop") + set(EXPECTED_FILE_2 "second.dmg") + set(EXPECTED_FILE_3 "pkg_3_abc.dmg") endif() diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake index 4c20e41..899258e 100644 --- a/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake +++ b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake @@ -10,6 +10,9 @@ if(GENERATOR_TYPE STREQUAL "DEB" OR GENERATOR_TYPE STREQUAL "RPM") elseif(GENERATOR_TYPE STREQUAL "TGZ") set(CPACK_ARCHIVE_PKG_2_FILE_NAME "second") set(CPACK_ARCHIVE_PKG_3_FILE_NAME "pkg_3_abc") +elseif(GENERATOR_TYPE STREQUAL "DragNDrop") + set(CPACK_DMG_PKG_2_FILE_NAME "second") + set(CPACK_DMG_PKG_3_FILE_NAME "pkg_3_abc") endif() install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_1) |