meson: use add_project_arguments() instead of add_global_arguments()

add_global_arguments() doesn't work if the project is used as a
subproject.
This commit is contained in:
Tim-Philipp Müller 2017-02-16 09:50:56 +00:00 committed by Matthias Clasen
parent 34e4e25d53
commit 1224ff0c39

View File

@ -15,7 +15,7 @@ if cc.get_id() == 'msvc'
# If a warning is completely useless and spammy, use '/wdXXXX' to suppress it # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
# If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once
# NOTE: Only add warnings here if you are sure they're spurious # NOTE: Only add warnings here if you are sure they're spurious
add_global_arguments('/wd4244', '/wd4305', '/wd4035', '/wd4715', '/wd4116', add_project_arguments('/wd4244', '/wd4305', '/wd4035', '/wd4715', '/wd4116',
'/wd4046', '/wd4068', '/wo4090', language : 'c') '/wd4046', '/wd4068', '/wo4090', language : 'c')
# Disable SAFESEH with MSVC for plugins and libs that use external deps that # Disable SAFESEH with MSVC for plugins and libs that use external deps that
# are built with MinGW # are built with MinGW
@ -27,8 +27,6 @@ endif
host_system = host_machine.system() host_system = host_machine.system()
#add_global_arguments('-Werror', language : 'c') # FIXME
glib_version = meson.project_version() glib_version = meson.project_version()
glib_api_version = '2.0' glib_api_version = '2.0'
version_arr = glib_version.split('.') version_arr = glib_version.split('.')