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

[meson] Remove spaces before named parameter colons 

meson documentations sometimes adds the space and sometimes don't and we
aren't adding it most of the times unconsciously so let's the cases and
be consistent.
This commit is contained in:
Ebrahim Byagowi 2020-06-11 19:09:24 +04:30
parent 2d91662294
commit 62de2f749c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meson.build
View File

@ -1,6 +1,6 @@
project('harfbuzz', 'c', 'cpp', project('harfbuzz', 'c', 'cpp',
meson_version: '>= 0.53.0', meson_version: '>= 0.53.0',
default_options : ['cpp_std=c++11'], default_options: ['cpp_std=c++11'],
version: '2.6.7') version: '2.6.7')
warning('Meson is not our main build system yet, don\'t use it for packaging HarfBuzz for *nix distros for now') warning('Meson is not our main build system yet, don\'t use it for packaging HarfBuzz for *nix distros for now')
@ -36,25 +36,25 @@ 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', 'cpp']) add_project_arguments(msvc_args, language: ['c', '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_project_link_arguments(cpp.get_supported_link_arguments([ add_project_link_arguments(cpp.get_supported_link_arguments([
'-Bsymbolic-functions' '-Bsymbolic-functions'
]), language : 'c') ]), language: 'c')
add_project_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',
'-fvisibility-inlines-hidden', # maybe shouldn't be applied for mingw '-fvisibility-inlines-hidden', # maybe shouldn't be applied for mingw
]), language : 'cpp') ]), language: 'cpp')
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_project_arguments('-mstructure-size-boundary=8', language : 'cpp') add_project_arguments('-mstructure-size-boundary=8', language: 'cpp')
endif endif
endif endif
@ -256,16 +256,16 @@ endif
# CoreText (macOS) - FIXME: untested # CoreText (macOS) - FIXME: untested
coretext_deps = [] coretext_deps = []
if host_machine.system() == 'darwin' and not get_option('coretext').disabled() if host_machine.system() == 'darwin' and not get_option('coretext').disabled()
app_services_dep = dependency('appleframeworks', modules : ['ApplicationServices'], required: false) app_services_dep = dependency('appleframeworks', modules: ['ApplicationServices'], required: false)
if cpp.has_type('CTFontRef', prefix: '#include <ApplicationServices/ApplicationServices.h>', dependencies: app_services_dep) if cpp.has_type('CTFontRef', prefix: '#include <ApplicationServices/ApplicationServices.h>', dependencies: app_services_dep)
coretext_deps += [app_services_dep] coretext_deps += [app_services_dep]
conf.set('HAVE_CORETEXT', 1) conf.set('HAVE_CORETEXT', 1)
# On iOS CoreText and CoreGraphics are stand-alone frameworks # On iOS CoreText and CoreGraphics are stand-alone frameworks
# Check for a different symbol to avoid getting cached result # Check for a different symbol to avoid getting cached result
else else
coretext_dep = dependency('appleframeworks', modules : ['CoreText'], required: false) coretext_dep = dependency('appleframeworks', modules: ['CoreText'], required: false)
coregraphics_dep = dependency('appleframeworks', modules : ['CoreGraphics'], required: false) coregraphics_dep = dependency('appleframeworks', modules: ['CoreGraphics'], required: false)
corefoundation_dep = dependency('appleframeworks', modules : ['CoreFoundation'], required: false) corefoundation_dep = dependency('appleframeworks', modules: ['CoreFoundation'], required: false)
if cpp.has_type('CTRunRef', prefix: '#include <CoreText/CoreText.h>', dependencies: [coretext_dep, coregraphics_dep, corefoundation_dep]) if cpp.has_type('CTRunRef', prefix: '#include <CoreText/CoreText.h>', dependencies: [coretext_dep, coregraphics_dep, corefoundation_dep])
coretext_deps += [coretext_dep, coregraphics_dep, corefoundation_dep] coretext_deps += [coretext_dep, coregraphics_dep, corefoundation_dep]
conf.set('HAVE_CORETEXT', 1) conf.set('HAVE_CORETEXT', 1)

10
meson_options.txt
View File

@ -21,12 +21,12 @@ option('coretext', type: 'feature', value: 'disabled',
description: 'Enable CoreText shaper backend on macOS') description: 'Enable CoreText shaper backend on macOS')
# Common feature options # Common feature options
option('tests', type : 'feature', value : 'enabled', yield : true, option('tests', type: 'feature', value: 'enabled', yield: true,
description: 'Enable or disable unit tests') description: 'Enable or disable unit tests')
option('introspection', type : 'feature', value : 'auto', yield : true, option('introspection', type: 'feature', value: 'auto', yield: true,
description : 'Generate gobject-introspection bindings (.gir/.typelib files)') description: 'Generate gobject-introspection bindings (.gir/.typelib files)')
option('gtk_doc', type : 'feature', value : 'auto', yield : true, option('gtk_doc', type: 'feature', value: 'auto', yield: true,
description : 'Generate documentation with gtk-doc') description: 'Generate documentation with gtk-doc')
option('icu_builtin', type: 'boolean', value: false, option('icu_builtin', type: 'boolean', value: false,
description: 'Don\'t separate ICU support as harfbuzz-icu module') description: 'Don\'t separate ICU support as harfbuzz-icu module')