Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES' d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7220