diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-08 17:39:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-08 17:40:00 (GMT) |
| commit | befcd6ea1db0fee91835a1158960de582993e32d (patch) | |
| tree | 60dfca8271d498a1fecf7dcb78f5c55d3fef2e65 /Modules | |
| parent | 75d1f7aa2e6951697393f97b8e7bb02c85fbb8ce (diff) | |
| parent | 4ef974e6cb41537a2ab40ab02b684cb44e098794 (diff) | |
| download | CMake-befcd6ea1db0fee91835a1158960de582993e32d.zip CMake-befcd6ea1db0fee91835a1158960de582993e32d.tar.gz CMake-befcd6ea1db0fee91835a1158960de582993e32d.tar.bz2 | |
Merge topic 'cpack-drop-osxx11'
4ef974e6cb CPack: Remove undocumented deprecated OSXX11 generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6704
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPack.cmake | 5 | ||||
| -rw-r--r-- | Modules/Internal/CPack/CPack.OSXScriptLauncher.in | bin | 29592 -> 0 bytes | |||
| -rw-r--r-- | Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in | bin | 362 -> 0 bytes |
3 files changed, 1 insertions, 4 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 373a707..50a9525 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -262,7 +262,7 @@ installers. The most commonly-used variables are: create Start Menu shortcuts. For example, setting this to the list ``ccmake;CMake`` will create a shortcut named "CMake" that will execute the installed executable ``ccmake``. Not all CPack generators use it (at least - NSIS, WIX and OSXX11 do). + NSIS, and WIX do). .. variable:: CPACK_STRIP_FILES @@ -658,13 +658,11 @@ 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 (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( CPACK_BINARY_BUNDLE CPACK_BINARY_DRAGNDROP - CPACK_BINARY_OSXX11 CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_PRODUCTBUILD ) @@ -717,7 +715,6 @@ if(NOT CPACK_GENERATOR) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_IFW IFW) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_NSIS NSIS) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_NUGET NuGet) - cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PRODUCTBUILD productbuild) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_RPM RPM) diff --git a/Modules/Internal/CPack/CPack.OSXScriptLauncher.in b/Modules/Internal/CPack/CPack.OSXScriptLauncher.in Binary files differdeleted file mode 100644 index c715860..0000000 --- a/Modules/Internal/CPack/CPack.OSXScriptLauncher.in +++ /dev/null diff --git a/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in b/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in Binary files differdeleted file mode 100644 index 5f5f17a..0000000 --- a/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in +++ /dev/null |