Merge topic 'fix-config-selection'

a40896c0e4 cmTarget: Fix (new) configuration selection
702b7fda49 cmTarget: Improve code style

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