luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 23:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: Use the b_vscrt option for selecting the CRT

Browse Source 
This option has been available since 0.48, and we should use it
instead of only guessing based on buildtype.
This commit is contained in:
Nirbheek Chauhan
2020-03-12 17:42:27 +05:30
parent e7cfe62e73
commit b462e2c80c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/meson.build
View File

@@ -105,7 +105,7 @@ if not dbus1_dep.found()
# MSVC: Search for the DBus library by the configuration, which corresponds # MSVC: Search for the DBus library by the configuration, which corresponds
# to the output of CMake builds of DBus. Note that debugoptimized # to the output of CMake builds of DBus. Note that debugoptimized
# is really a Release build with .PDB files. # is really a Release build with .PDB files.
if buildtype == 'debug' if vs_crt == 'debug'
dbus1_dep = cc.find_library('dbus-1d', required : false) dbus1_dep = cc.find_library('dbus-1d', required : false)
else else
dbus1_dep = cc.find_library('dbus-1', required : false) dbus1_dep = cc.find_library('dbus-1', required : false)

16
meson.build
View File

@@ -210,9 +210,17 @@ else
endif endif
glibconfig_conf.set('glib_os', glib_os) glibconfig_conf.set('glib_os', glib_os)
# We need to know the build type to determine what .lib files we need on Visual Studio # We need to know the CRT being used to determine what .lib files we need on
# for dependencies that don't normally come with pkg-config files for Visual Studio builds # Visual Studio for dependencies that don't normally come with pkg-config files
buildtype = get_option('buildtype') vs_crt = 'release'
vs_crt_opt = get_option('b_vscrt')
if vs_crt_opt in ['mdd', 'mtd']
vs_crt = 'debug'
elif vs_crt_opt == 'from_buildtype'
if get_option('buildtype') == 'debug'
vs_crt = 'debug'
endif
endif
# Use debug/optimization flags to determine whether to enable debug or disable # Use debug/optimization flags to determine whether to enable debug or disable
# cast checks # cast checks
@@ -1852,7 +1860,7 @@ else
# MSVC: Search for the PCRE library by the configuration, which corresponds # MSVC: Search for the PCRE library by the configuration, which corresponds
# to the output of CMake builds of PCRE. Note that debugoptimized # to the output of CMake builds of PCRE. Note that debugoptimized
# is really a Release build with .PDB files. # is really a Release build with .PDB files.
if buildtype == 'debug' if vs_crt == 'debug'
pcre = cc.find_library('pcred', required : false) pcre = cc.find_library('pcred', required : false)
else else
pcre = cc.find_library('pcre', required : false) pcre = cc.find_library('pcre', required : false)