Merge topic 'find-cps-fix-defs'

8843407d52 cmPackageInfoReader: Improve warning messages
5fb1726761 cmPackageInfoReader: "Fix" handling of "includes"
c44c5b07be cmPackageInfoReader: Fix handling of "definitions"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10117