diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-31 14:53:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-31 15:04:31 (GMT) |
| commit | 7bf187499f9678c3493d5e6960c6ccabb6604c8d (patch) | |
| tree | e8a74132e2b74b18810f6cfaf27d32b1a082989f | |
| parent | 371e9e48a4186f41354938b0b805a351857c78a0 (diff) | |
| download | CMake-7bf187499f9678c3493d5e6960c6ccabb6604c8d.zip CMake-7bf187499f9678c3493d5e6960c6ccabb6604c8d.tar.gz CMake-7bf187499f9678c3493d5e6960c6ccabb6604c8d.tar.bz2 | |
CPack: Deprecate PackageMaker generator
Xcode no longer distributes the PackageMaker tools.
Add a deprecation warning when the generator is used.
Issue: #20235
| -rw-r--r-- | Help/cpack_gen/packagemaker.rst | 5 | ||||
| -rw-r--r-- | Help/release/dev/cpack-deprecate-old-macos-generators.rst | 5 | ||||
| -rw-r--r-- | Modules/CPack.cmake | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 3 |
4 files changed, 14 insertions, 1 deletions
diff --git a/Help/cpack_gen/packagemaker.rst b/Help/cpack_gen/packagemaker.rst index 81acb9d..c2a450e 100644 --- a/Help/cpack_gen/packagemaker.rst +++ b/Help/cpack_gen/packagemaker.rst @@ -3,6 +3,11 @@ CPack PackageMaker Generator PackageMaker CPack generator (macOS). +.. deprecated:: 3.17 + + Xcode no longer distributes the PackageMaker tools. + This CPack generator will be removed in a future version of CPack. + Variables specific to CPack PackageMaker generator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Help/release/dev/cpack-deprecate-old-macos-generators.rst b/Help/release/dev/cpack-deprecate-old-macos-generators.rst new file mode 100644 index 0000000..7965252 --- /dev/null +++ b/Help/release/dev/cpack-deprecate-old-macos-generators.rst @@ -0,0 +1,5 @@ +cpack-deprecate-old-macos-generators +------------------------------------ + +* The :cpack_gen:`CPack PackageMaker Generator` generator has been + deprecated because Xcode no longer distributes the PackageMaker tools. diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index f6f6320..3137374 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -564,7 +564,7 @@ if(NOT CPACK_GENERATOR) option(CPACK_BINARY_BUNDLE "Enable to build OSX bundles" OFF) option(CPACK_BINARY_DRAGNDROP "Enable to build OSX Drag And Drop package" OFF) option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages" OFF) - option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" OFF) + option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages (deprecated)" OFF) option(CPACK_BINARY_PRODUCTBUILD "Enable to build productbuild packages" OFF) mark_as_advanced( CPACK_BINARY_BUNDLE diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 12ea97b..f51ea42 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -321,6 +321,9 @@ int cmCPackPackageMakerGenerator::PackageFiles() int cmCPackPackageMakerGenerator::InitializeInternal() { + cmCPackLogger(cmCPackLog::LOG_WARNING, + "The PackageMaker generator is deprecated " + "and will be removed in a future version.\n"); this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr"); // Starting with Xcode 4.3, PackageMaker is a separate app, and you |