diff options
author | Craig Scott <craig.scott@crascit.com> | 2022-04-29 08:34:22 (GMT) |
---|---|---|
committer | Craig Scott <craig.scott@crascit.com> | 2022-05-04 22:36:44 (GMT) |
commit | c150f89f4df7dd6351094d61dca4223450cbf09c (patch) | |
tree | d590647bcf61180b19290f574568f5db945199f5 /Tests | |
parent | e0dbca93aae6b01f8b239d346a0bc99d2ca2473e (diff) | |
download | CMake-c150f89f4df7dd6351094d61dca4223450cbf09c.zip CMake-c150f89f4df7dd6351094d61dca4223450cbf09c.tar.gz CMake-c150f89f4df7dd6351094d61dca4223450cbf09c.tar.bz2 |
CPack: Remove the deprecated PackageMaker generator
This CPack generator has been deprecated since commit 7bf187499f
(CPack: Deprecate PackageMaker generator, 2020-01-31).
Fixes: #23344
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLists.txt | 11 | ||||
-rw-r--r-- | Tests/CPackComponents/VerifyResult.cmake | 4 | ||||
-rw-r--r-- | Tests/CPackComponentsForAll/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/X11/CMakeLists.txt | 1 |
4 files changed, 2 insertions, 16 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 9a4910f..9a1cf69 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -294,17 +294,6 @@ if(BUILD_TESTING) mark_as_advanced(CTEST_TEST_CTEST) endif () - # Should CPack tests be run? By default, yes, but... - # - # Disable packaging test on Apple 10.3 and below. PackageMaker starts - # DiskManagementTool as root and disowns it - # (http://lists.apple.com/archives/installer-dev/2005/Jul/msg00005.html). - # It is left holding open pipe handles and preventing ProcessUNIX from - # detecting end-of-data even after its immediate child exits. Then - # the test hangs until it times out and is killed. This is a - # well-known bug in kwsys process execution that I would love to get - # time to fix. - # option(CTEST_TEST_CPACK "Should the tests that use '--build-target package' be run?" ON) diff --git a/Tests/CPackComponents/VerifyResult.cmake b/Tests/CPackComponents/VerifyResult.cmake index c7c24fd..5e08e60 100644 --- a/Tests/CPackComponents/VerifyResult.cmake +++ b/Tests/CPackComponents/VerifyResult.cmake @@ -22,9 +22,7 @@ if(WIN32) endif() if(APPLE) - # Always expect the *.dmg installer - PackageMaker should always - # be installed on a development Mac: - # + # Always expect the *.dmg installer set(expected_file_mask "${CPackComponents_BINARY_DIR}/MyLib-*.dmg") endif() diff --git a/Tests/CPackComponentsForAll/CMakeLists.txt b/Tests/CPackComponentsForAll/CMakeLists.txt index e49138a..a1a9709 100644 --- a/Tests/CPackComponentsForAll/CMakeLists.txt +++ b/Tests/CPackComponentsForAll/CMakeLists.txt @@ -5,7 +5,7 @@ # which supports CPack components. # # Depending on the CPack generator and on some CPACK_xxx var values -# the generator may produce a single (NSIS, PackageMaker) +# the generator may produce a single (NSIS, productbuild) # or several package files (Archive Generators, RPM, DEB) cmake_minimum_required(VERSION 2.8.3.20101130 FATAL_ERROR) project(CPackComponentsForAll) diff --git a/Tests/X11/CMakeLists.txt b/Tests/X11/CMakeLists.txt index ba45e96..b190de2 100644 --- a/Tests/X11/CMakeLists.txt +++ b/Tests/X11/CMakeLists.txt @@ -29,7 +29,6 @@ if(X11_FOUND) target_link_libraries(HelloWorldX11 ${X11_LIBRARIES}) install(TARGETS HelloWorldX11 DESTINATION bin) - set(CPACK_BINARY_PACKAGEMAKER OFF CACHE BOOL "" FORCE ) set(CPACK_PACKAGE_NAME HelloWorldX11Package) set(CPACK_PACKAGE_EXECUTABLES HelloWorldX11 HelloWorldX11) endif() |