Merge topic 'cpack-productbuild-nicer-code' c33955688c cmCPackProductBuildGenerator: Modernize some code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !11878