Merge topic 'cmake-presets-toolset-arch-config' into release-3.19

64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field

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