Merge topic 'cps-fix-extra-schema' into release-4.0 83b22da7ac cmPackageInfoReader: Inherit cps_version caff0d62c6 cmFindPackageCommand: Simplify cmStrCat Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !10329