From bb8aaa310887aa6b4a5ec2bfa9ee0330f1619c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 14 Mar 2020 01:05:38 +0000 Subject: [PATCH] [meson] use add_project_arguments() instead of add_global_arguments() .. and simplify, can pass two languages in one go. add_global_arguments() won't work if harfbuzz is used as a meson subproject. --- meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 2143d72e8..c22e92626 100644 --- a/meson.build +++ b/meson.build @@ -34,13 +34,12 @@ if cpp.get_id() == 'msvc' '/wd4305', # truncating type conversion (e.g. double -> float) cpp.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8 ] - add_project_arguments(msvc_args, language : 'c') - add_project_arguments(msvc_args, language : 'cpp') + add_project_arguments(msvc_args, language : ['c', 'cpp']) # Disable SAFESEH with MSVC for libs that use external deps that are built with MinGW # noseh_link_args = ['/SAFESEH:NO'] endif -add_global_arguments(cpp.get_supported_arguments([ +add_project_arguments(cpp.get_supported_arguments([ '-fno-rtti', '-fno-exceptions', '-fno-threadsafe-statics', @@ -49,7 +48,7 @@ add_global_arguments(cpp.get_supported_arguments([ if host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') != 1 if cpp.has_argument('-mstructure-size-boundary=8') - add_global_arguments('-mstructure-size-boundary=8', language : 'cpp') + add_project_arguments('-mstructure-size-boundary=8', language : 'cpp') endif endif