Merge topic 'vs-CharacterSet' cbddc66277 VS: Consider macros with values when determining CharacterSet Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8940