meson: remove braces from if statements
More consistency and less noise.
This commit is contained in:
parent
d3a2d8dffe
commit
3b80c24dca
|
@ -72,55 +72,54 @@ header_checks = [
|
|||
|
||||
function_checks = [
|
||||
# function name | headers that are needed | libraries to include | Defines that are needed
|
||||
['alloca', ['alloca.h']],
|
||||
['backtrace', ['execinfo.h']],
|
||||
['backtrace_symbols', ['execinfo.h']],
|
||||
['chown', ['unistd.h']],
|
||||
['clock_gettime', ['time.h']],
|
||||
['dirfd', ['dirent.h sys/types.h']],
|
||||
['fchmod', ['sys/stat.h']],
|
||||
['fcntl', ['fcntl.h']],
|
||||
['fork', ['unistd.h']],
|
||||
['fpathconf', ['unistd.h']],
|
||||
['geteuid', ['unistd.h']],
|
||||
['getpagesize', ['unistd.h']],
|
||||
['getpwent', ['sys/types.h', 'pwd.h']],
|
||||
['getuid', ['unistd.h']],
|
||||
['alloca', ['alloca.h' ]],
|
||||
['backtrace', ['execinfo.h' ]],
|
||||
['backtrace_symbols', ['execinfo.h' ]],
|
||||
['chown', ['unistd.h' ]],
|
||||
['clock_gettime', ['time.h' ]],
|
||||
['dirfd', ['dirent.h sys/types.h' ]],
|
||||
['fchmod', ['sys/stat.h' ]],
|
||||
['fcntl', ['fcntl.h' ]],
|
||||
['fork', ['unistd.h' ]],
|
||||
['fpathconf', ['unistd.h' ]],
|
||||
['geteuid', ['unistd.h' ]],
|
||||
['getpagesize', ['unistd.h' ]],
|
||||
['getpwent', ['sys/types.h', 'pwd.h' ]],
|
||||
['getuid', ['unistd.h' ]],
|
||||
['getxattr', ['sys/types.h', 'sys/xattr.h']],
|
||||
['iconv', ['iconv.h']],
|
||||
['iconv', ['iconv.h' ]],
|
||||
['listxattr', ['sys/types.h', 'sys/xattr.h']],
|
||||
['malloc_info', ['malloc.h']],
|
||||
['malloc_usable_size', ['malloc.h']],
|
||||
['mkdirat', ['sys/stat.h']],
|
||||
['mmap', ['sys/mman.h']],
|
||||
['mtrace', ['mcheck.h']],
|
||||
['prctl', ['sys/prctl.h']],
|
||||
['procctl', ['sys/procctl.h']],
|
||||
['realpath', ['stdlib.h']],
|
||||
['malloc_info', ['malloc.h' ]],
|
||||
['malloc_usable_size', ['malloc.h' ]],
|
||||
['mkdirat', ['sys/stat.h' ]],
|
||||
['mmap', ['sys/mman.h' ]],
|
||||
['mtrace', ['mcheck.h' ]],
|
||||
['prctl', ['sys/prctl.h' ]],
|
||||
['procctl', ['sys/procctl.h' ]],
|
||||
['realpath', ['stdlib.h' ]],
|
||||
['setxattr', ['sys/types.h', 'sys/xattr.h']],
|
||||
['siglongjmp', ['setjmp.h']],
|
||||
['strerror_r', ['string.h']],
|
||||
['gettimeofday', ['sys/time.h']],
|
||||
['execvp', ['unistd.h']],
|
||||
['pause', ['unistd.h']],
|
||||
['isfinite', ['math.h']],
|
||||
#FIXME strlcpy is detected by meson but drops at compilation time
|
||||
# ['strlcpy', ['string.h']],
|
||||
['siginfo_t', ['signal.h']],
|
||||
['siglongjmp', ['setjmp.h' ]],
|
||||
['strerror_r', ['string.h' ]],
|
||||
['gettimeofday', ['sys/time.h' ]],
|
||||
['execvp', ['unistd.h' ]],
|
||||
['pause', ['unistd.h' ]],
|
||||
['isfinite', ['math.h' ]],
|
||||
['strlcpy', ['string.h' ]],
|
||||
['siginfo_t', ['signal.h' ]],
|
||||
['pthread_getcpuclockid', ['pthread.h', 'time.h']],
|
||||
['timerfd_create', ['sys/timerfd.h']],
|
||||
['timerfd_create', ['sys/timerfd.h' ]],
|
||||
['kevent', ['sys/types.h', 'sys/event.h', 'sys/time.h']],
|
||||
#from here on we specify the dependencies
|
||||
['dlopen', ['dlfcn.h'], ['dl']],
|
||||
['dlsym', ['dlfcn.h'], ['dl']],
|
||||
['lround', ['math.h'], ['m']],
|
||||
['mallinfo2', ['malloc.h'], ['malloc']],
|
||||
['mallinfo', ['malloc.h'], ['malloc']],
|
||||
['shm_open', ['sys/mman.h', 'sys/stat.h', 'fcntl.h'], ['rt']],
|
||||
['dlopen', ['dlfcn.h' ], ['dl' ] ],
|
||||
['dlsym', ['dlfcn.h' ], ['dl' ] ],
|
||||
['lround', ['math.h' ], ['m' ] ],
|
||||
['mallinfo2', ['malloc.h' ], ['malloc'] ],
|
||||
['mallinfo', ['malloc.h' ], ['malloc'] ],
|
||||
['shm_open', ['sys/mman.h', 'sys/stat.h', 'fcntl.h'], ['rt'] ],
|
||||
#from here on we specify arguments
|
||||
['splice', ['fcntl.h'], [], '-D_GNU_SOURCE=1'],
|
||||
['sched_getcpu', ['sched.h'], [], '-D_GNU_SOURCE=1'],
|
||||
['dladdr', ['dlfcn.h'], ['dl'], '-D_GNU_SOURCE=1']
|
||||
['splice', ['fcntl.h' ], [ ], '-D_GNU_SOURCE=1'],
|
||||
['sched_getcpu', ['sched.h' ], [ ], '-D_GNU_SOURCE=1'],
|
||||
['dladdr', ['dlfcn.h' ], ['dl' ], '-D_GNU_SOURCE=1']
|
||||
]
|
||||
|
||||
open_cloexec = cc.compiles('''#include <sys/types.h>
|
||||
|
@ -205,7 +204,7 @@ foreach function : function_checks
|
|||
endforeach
|
||||
|
||||
# The next checks are manually for now due to the fact that some names are not within the default pattern
|
||||
if (cc.has_header_symbol('sys/stat.h', 'fstatat'))
|
||||
if cc.has_header_symbol('sys/stat.h', 'fstatat')
|
||||
config_h.set10('HAVE_ATFILE_SOURCE', true)
|
||||
endif
|
||||
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
bindings = get_option('bindings')
|
||||
bindings_order = ['lua', 'cxx', 'mono']
|
||||
|
||||
if (get_option('dotnet') and not bindings.contains('mono'))
|
||||
if get_option('dotnet') and not bindings.contains('mono')
|
||||
message('dotnet support requires the C# bindings')
|
||||
bindings += ['mono']
|
||||
endif
|
||||
|
||||
if (bindings.contains('cxx') == false and bindings.contains('mono'))
|
||||
if bindings.contains('cxx') == false and bindings.contains('mono')
|
||||
subdirs = ['eina_cxx', 'eolian_cxx']
|
||||
subdir(join_paths('cxx', 'eina_cxx'))
|
||||
inc_dir = []
|
||||
|
|
|
@ -71,7 +71,7 @@ manual_inheritance_files = [
|
|||
]
|
||||
|
||||
beta_option = []
|
||||
if (get_option('mono-beta'))
|
||||
if get_option('mono-beta')
|
||||
beta_option = '-b'
|
||||
endif
|
||||
|
||||
|
@ -87,7 +87,7 @@ foreach lib : mono_sublibs
|
|||
dllimport = 'lib' + dllimport + '-' + version_major
|
||||
endif
|
||||
|
||||
if (package_name != 'eldbus')
|
||||
if package_name != 'eldbus'
|
||||
foreach eo_file_subdir : eo_file_subdirs
|
||||
if eo_file_subdir != ''
|
||||
mono_pub_eo_files = get_variable(package_name + '_' + eo_file_subdir +'_eo_files') + get_variable(package_name + '_' + eo_file_subdir + '_eot_files')
|
||||
|
@ -143,7 +143,7 @@ endif
|
|||
efl_mono_install_dir = join_paths(dir_lib, 'efl-mono-'+version_major)
|
||||
efl_mono_xml_doc = join_paths(meson.current_build_dir(), 'efl_mono.xml')
|
||||
|
||||
if (get_option('dotnet'))
|
||||
if get_option('dotnet')
|
||||
styles = ['CA1000', 'CA1030', 'CA1031', 'CA1032', 'CA1034', 'CA1036', 'CA1040',
|
||||
'CA1043', 'CA1044', 'CA1051', 'CA1052', 'CA1062', 'CA1063', 'CA1064',
|
||||
'CA1065', 'CA1303', 'CA1305', 'CA1307', 'CA1401', 'CA1507', 'CA1707',
|
||||
|
|
|
@ -2,7 +2,7 @@ edje_externals = ['emotion', 'elementary']
|
|||
|
||||
foreach edje_external : edje_externals
|
||||
#!?%$§#! custom nane for edje externals
|
||||
if (edje_external == 'elementary')
|
||||
if edje_external == 'elementary'
|
||||
mod_install_dir = join_paths(dir_lib, 'edje', 'modules', 'elm', version_name)
|
||||
else
|
||||
mod_install_dir = join_paths(dir_lib, 'edje', 'modules', edje_external, version_name)
|
||||
|
|
|
@ -47,7 +47,7 @@ edc_files = [
|
|||
'center_zoom.edc',
|
||||
]
|
||||
|
||||
if (get_option('physics'))
|
||||
if get_option('physics')
|
||||
edc_files += [
|
||||
'physics_3d.edc',
|
||||
'physics_actions.edc',
|
||||
|
|
|
@ -10,7 +10,7 @@ edje_deps = [
|
|||
edje_pub_deps = [evas, eo, efl]
|
||||
edje_ext_deps = [m, lua, buildsystem_simple]
|
||||
|
||||
if (get_option('physics'))
|
||||
if get_option('physics')
|
||||
edje_deps += ephysics
|
||||
edje_pub_deps += ephysics
|
||||
endif
|
||||
|
|
|
@ -36,7 +36,7 @@ if get_option('v4l2')
|
|||
endif
|
||||
endif
|
||||
|
||||
if (get_option('libmount'))
|
||||
if get_option('libmount')
|
||||
libmount = dependency('mount')
|
||||
eeze_ext_deps += [libmount]
|
||||
if libmount.version() == '2.19'
|
||||
|
|
|
@ -2,7 +2,7 @@ efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, ei
|
|||
efl_canvas_wl_pub_deps = [eo, efl, evas]
|
||||
efl_canvas_wl_ext_deps = [dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0'), wayland_protocol]
|
||||
|
||||
if (get_option('x11'))
|
||||
if get_option('x11')
|
||||
efl_canvas_wl_deps += [ecore_x]
|
||||
efl_canvas_wl_ext_deps += [dependency('xkbcommon-x11')]
|
||||
endif
|
||||
|
|
|
@ -18,7 +18,7 @@ emile_src = files([
|
|||
'emile_base64.c',
|
||||
])
|
||||
|
||||
if (get_option('crypto') == 'openssl')
|
||||
if get_option('crypto') == 'openssl'
|
||||
emile_src += files('emile_cipher_openssl.c')
|
||||
endif
|
||||
|
||||
|
|
|
@ -157,17 +157,17 @@ evas_src_opt = [ ]
|
|||
|
||||
evas_ext_none_static_deps += dependency('freetype2')
|
||||
|
||||
if (get_option('fontconfig'))
|
||||
if get_option('fontconfig')
|
||||
config_h.set('HAVE_FONTCONFIG', '1')
|
||||
evas_ext_none_static_deps += dependency('fontconfig')
|
||||
endif
|
||||
|
||||
if (get_option('fribidi'))
|
||||
if get_option('fribidi')
|
||||
config_h.set('HAVE_FRIBIDI', '1')
|
||||
evas_ext_none_static_deps += dependency('fribidi')
|
||||
endif
|
||||
|
||||
if (get_option('pixman'))
|
||||
if get_option('pixman')
|
||||
pixman_support = ['HAVE_PIXMAN', 'PIXMAN_FONT', 'PIXMAN_RECT', 'PIXMAN_LINE', 'PIXMAN_POLY', 'PIXMAN_IMAGE', 'PIXMAN_IMAGE_SCALE_SAMPLE']
|
||||
foreach support : pixman_support
|
||||
config_h.set(support, '1')
|
||||
|
@ -175,7 +175,7 @@ if (get_option('pixman'))
|
|||
evas_ext_none_static_deps += dependency('pixman-1')
|
||||
endif
|
||||
|
||||
if (get_option('hyphen'))
|
||||
if get_option('hyphen')
|
||||
config_h.set('HAVE_HYPHEN', '1')
|
||||
hyphen = dependency('hyphen', required : false)
|
||||
if hyphen.found() == false
|
||||
|
@ -274,7 +274,7 @@ foreach loader_inst : evas_vg_loaders_file
|
|||
loader = loader_inst[0]
|
||||
loader_deps = loader_inst[1]
|
||||
|
||||
if (get_option('evas-loaders-disabler').contains(loader) == false)
|
||||
if get_option('evas-loaders-disabler').contains(loader) == false
|
||||
file = join_paths(source_root, 'src', 'modules', 'evas', 'vg_loaders', loader, 'evas_vg_load_'+loader+'.c')
|
||||
evas_static_list += [declare_dependency(
|
||||
sources: file,
|
||||
|
@ -285,7 +285,7 @@ foreach loader_inst : evas_vg_loaders_file
|
|||
endforeach
|
||||
|
||||
foreach loader : evas_vg_savers_file
|
||||
if (get_option('evas-loaders-disabler').contains(loader) == false)
|
||||
if get_option('evas-loaders-disabler').contains(loader) == false
|
||||
file = join_paths(source_root, 'src', 'modules', 'evas', 'vg_savers', loader, 'evas_vg_save_'+loader+'.c')
|
||||
evas_static_list += [declare_dependency(
|
||||
sources: file,
|
||||
|
|
Loading…
Reference in New Issue