Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • CMake CMake
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,922
    • Issues 3,922
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 10
    • Merge requests 10
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • External wiki
    • External wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • CMake
  • CMakeCMake
  • Merge requests
  • !7220

productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Craig Scott requested to merge craig.scott/cmake:restore-CPACK_PACKAGEMAKER_CHOICES into master Apr 29, 2022
  • Overview 7
  • Commits 1
  • Pipelines 2
  • Changes 3

In !7092 (merged), the variable holding the main contents of the distribution.dist XML file was renamed from CPACK_PACKAGEMAKER_CHOICES to CPACK_APPLE_PKG_INSTALLER_CONTENT. This reflected the fact that the PackageMaker generator is deprecated. The new variable also includes more details than the old one held. Some projects were relying on the old variable name, so we need to still set that to the same contents as it would have previously provided.

Neither of these variables were previously documented, but the older variable was mentioned in enough semi-official places that it essentially became semi-supported. Document both variables and highlight that the older one is deprecated.

Fixes: #23467 (closed)
Backport: release

Edited Apr 29, 2022 by Brad King
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: restore-CPACK_PACKAGEMAKER_CHOICES