Merge topic 'mpi-multiline'

a7cc231bd3 FindMPI: Improve configuration extraction

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