Merge topic 'cmake_config_compat'

1a2f984f CMake config: Use newer version compatibility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5203