mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 11:49:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME

Browse Source
This commit is contained in:
Andrew Fuller
2020-01-14 15:27:22 -08:00
parent b53230fbee
commit 6d6f4b9316
6 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Help/cpack_gen/dmg.rst
View File

@@ -81,6 +81,13 @@ on macOS:
``<language>.menu.txt`` and ``<language>.license.txt`` in the directory
specified by the :variable:`CPACK_DMG_SLA_DIR` variable.
.. variable:: CPACK_DMG_<component>_FILE_NAME
File name when packaging ``<component>`` as its own DMG
(``CPACK_COMPONENTS_GROUPING`` set to IGNORE).
- Default: ``CPACK_PACKAGE_FILE_NAME-<component>``
.. variable:: CPACK_COMMAND_HDIUTIL
Path to the ``hdiutil(1)`` command used to operate on disk image files on

7
Help/release/dev/custom-dmg-names.rst Normal file
View File

@@ -0,0 +1,7 @@
custom-dmg-names
----------------
* The :cpack_gen:`CPack DragNDrop Generator` learned to use
the :variable:`CPACK_DMG_<component>_FILE_NAME` variable
to set a custom filename when packaging components into
their own DMGs.

5
Source/CPack/cmCPackDragNDropGenerator.cxx
View File

@@ -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);
}

2
Tests/RunCMake/CPack/RunCMakeTest.cmake
View File

@@ -5,7 +5,7 @@ include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
# run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP "PACKAGING_TYPES"
run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM.CUSTOM_BINARY_SPEC_FILE" false "MONOLITHIC;COMPONENT")
run_cpack_test(CUSTOM_NAMES "RPM.CUSTOM_NAMES;DEB.CUSTOM_NAMES;TGZ" true "COMPONENT")
run_cpack_test(CUSTOM_NAMES "RPM.CUSTOM_NAMES;DEB.CUSTOM_NAMES;TGZ;DragNDrop" true "COMPONENT")
run_cpack_test(DEBUGINFO "RPM.DEBUGINFO;DEB.DEBUGINFO" true "COMPONENT")
run_cpack_test_subtests(DEFAULT_PERMISSIONS "CMAKE_var_set;CPACK_var_set;both_set;invalid_CMAKE_var;invalid_CPACK_var" "RPM.DEFAULT_PERMISSIONS;DEB.DEFAULT_PERMISSIONS" false "MONOLITHIC;COMPONENT")
run_cpack_test(DEPENDENCIES "RPM.DEPENDENCIES;DEB.DEPENDENCIES" true "COMPONENT")

3
Tests/RunCMake/CPack/tests/CUSTOM_NAMES/ExpectedFiles.cmake
View File

@@ -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()

3
Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake
View File

@@ -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)