Merge topic 'improve-cps-multiple-inclusion' de5fa2ae53 find_package: Improve support for CPS multiple inclusion Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !10586