diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-31 15:04:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-31 15:04:41 (GMT) |
| commit | 2ed00e8ef831d08a66492b41764d84e6afb43b7f (patch) | |
| tree | b52dc7c1c34464a63ec30e9e59e9a245f9a22b3e | |
| parent | 7bf187499f9678c3493d5e6960c6ccabb6604c8d (diff) | |
| download | CMake-2ed00e8ef831d08a66492b41764d84e6afb43b7f.zip CMake-2ed00e8ef831d08a66492b41764d84e6afb43b7f.tar.gz CMake-2ed00e8ef831d08a66492b41764d84e6afb43b7f.tar.bz2 | |
CPack: Deprecate OSXX11 generator
The CPack OSXX11 generator has not had any updates since 2011 except as
part of sweeping maintenance changes. It also creates packages with a
OSXScriptLauncher binary that has only ppc and i386 architectures which
are not supported by Apple anymore. Furthermore, the generator is not
even mentioned in our documentation. Add a deprecation warning.
Fixes: #20235
| -rw-r--r-- | Help/release/dev/cpack-deprecate-old-macos-generators.rst | 1 | ||||
| -rw-r--r-- | Modules/CPack.cmake | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackOSXX11Generator.cxx | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Help/release/dev/cpack-deprecate-old-macos-generators.rst b/Help/release/dev/cpack-deprecate-old-macos-generators.rst index 7965252..15d121a 100644 --- a/Help/release/dev/cpack-deprecate-old-macos-generators.rst +++ b/Help/release/dev/cpack-deprecate-old-macos-generators.rst @@ -3,3 +3,4 @@ cpack-deprecate-old-macos-generators * The :cpack_gen:`CPack PackageMaker Generator` generator has been deprecated because Xcode no longer distributes the PackageMaker tools. + The undocumented ``OSXX11`` generator has also been deprecated. diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 3137374..684edae 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -563,7 +563,7 @@ if(NOT CPACK_GENERATOR) if(APPLE) 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_OSXX11 "Enable to build OSX X11 packages (deprecated)" 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( diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 951c65f..5de4a6f 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -178,6 +178,9 @@ int cmCPackOSXX11Generator::PackageFiles() int cmCPackOSXX11Generator::InitializeInternal() { + cmCPackLogger(cmCPackLog::LOG_WARNING, + "The OSXX11 generator is deprecated " + "and will be removed in a future version.\n"); cmCPackLogger(cmCPackLog::LOG_DEBUG, "cmCPackOSXX11Generator::Initialize()" << std::endl); std::vector<std::string> path; |