walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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.
This commit is contained in:
Tim-Philipp Müller 2020-03-14 01:05:38 +00:00 committed by Ebrahim Byagowi
parent 2f556c38c0
commit bb8aaa3108
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -34,13 +34,12 @@ if cpp.get_id() == 'msvc'
'/wd4305', # truncating type conversion (e.g. double -> float) '/wd4305', # truncating type conversion (e.g. double -> float)
cpp.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8 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 : ['c', 'cpp'])
add_project_arguments(msvc_args, language : 'cpp')
# Disable SAFESEH with MSVC for libs that use external deps that are built with MinGW # Disable SAFESEH with MSVC for libs that use external deps that are built with MinGW
# noseh_link_args = ['/SAFESEH:NO'] # noseh_link_args = ['/SAFESEH:NO']
endif endif
add_global_arguments(cpp.get_supported_arguments([ add_project_arguments(cpp.get_supported_arguments([
'-fno-rtti', '-fno-rtti',
'-fno-exceptions', '-fno-exceptions',
'-fno-threadsafe-statics', '-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 host_machine.cpu_family() == 'arm' and cpp.alignment('struct { char c; }') != 1
if cpp.has_argument('-mstructure-size-boundary=8') 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
endif endif