[glibmm: 2/2] Merge branch 'meson-msvc-toolset' into 'master'

[Chun-wei Fan <fanchunwei src gnome org>]

commit 8a49ff24290db1a5ed0b80e056ba824032a3b676
Merge: 2db15299 dfa75020
Author: Chun-wei Fan <fanc999 yahoo com tw>
Date:   Wed Jun 24 17:02:37 2020 +0000

    Merge branch 'meson-msvc-toolset' into 'master'
    
    Meson/Visual Studio builds: Include toolset version by default (master branch)
    
    See merge request GNOME/glibmm!37

 README.win32                     |  6 +++++-
 configure.ac                     |  1 +
 gio/giomm-uninstalled.pc.in      |  2 +-
 gio/giomm.pc.in                  |  2 +-
 gio/giomm/meson.build            |  6 +++---
 glib/glibmm-uninstalled.pc.in    |  2 +-
 glib/glibmm.pc.in                |  2 +-
 glib/glibmm/meson.build          |  6 +++---
 glib/meson.build                 |  3 ++-
 meson.build                      | 20 ++++++++++++++++++++
 meson_options.txt                |  2 ++
 tools/extra_defs_gen/meson.build |  4 ++--
 12 files changed, 42 insertions(+), 14 deletions(-)
---