Merge topic 'ninja-many-subdirs' into release-4.0

6de40e7a4d Ninja: Fix regression with `.bat` wrapper around `ninja`

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