This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit 97aa022fd222a08b71ce921c03c4c1f4c8a7aff9
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Thu Oct 10 12:23:21 2024 +0500
meson: remove rudimentary braces in if statements
---
meson.build | 22 +++++++++++-----------
meson/header_checks/meson.build | 2 +-
src/bindings/mono/meson.build | 6 +++---
src/examples/edje/meson.build | 2 +-
src/lib/edje/meson.build | 2 +-
src/lib/eeze/meson.build | 2 +-
src/lib/efl_canvas_wl/meson.build | 2 +-
src/lib/emile/meson.build | 2 +-
src/lib/evas/meson.build | 8 ++++----
src/static_libs/libunibreak/meson.build | 4 ++--
src/static_libs/lz4/meson.build | 2 +-
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/meson.build b/meson.build
index 9d5c042b31..8240d8abf8 100644
--- a/meson.build
+++ b/meson.build
@@ -423,7 +423,7 @@ foreach package : subprojects
set_variable(package_name + '_eot_files', pub_eo_types_files)
set_variable(package_name + '_header_subdirs', package_header_subdirs)
set_variable(package_name + '_eo_subdirs', package_eo_subdirs)
- if (package[8] and get_option('efl-one'))
+ if package[8] and get_option('efl-one')
src = ""
external_deps = get_variable(package_name+'_ext_deps')
efl_one_include_dirs += [include_directories('.'), include_directories(local_lib / package_name)]
@@ -447,12 +447,12 @@ foreach package : subprojects
endif
endif
#special case for eolian, this is never efl-one, but will be required in the library
- if (package_name == 'eolian')
+ if package_name == 'eolian'
package_c_args = [
'-DPACKAGE_DATA_DIR="'+ (dir_data / package_name)+'"',
'-DNEED_RUN_IN_TREE=1',
]
- if (package[4])
+ if package[4]
subdir(local_bin / package_name)
endif
endif
@@ -475,7 +475,7 @@ foreach package : subprojects
foreach subdir : package_header_subdirs
tmp_package_subdirs += (package_version_name / subdir)
endforeach
- if (package[8] and get_option('efl-one'))
+ if package[8] and get_option('efl-one')
efl_one_sub_dirs += [package_version_name] + tmp_package_subdirs
endif
pkgconfig.generate(tmp_lib,
@@ -492,7 +492,7 @@ foreach package : subprojects
endif
endforeach
-if (get_option('efl-one'))
+if get_option('efl-one')
#building efl-one
efl_one_lib = shared_library('efl-one',
link_whole : efl_one_parts,
@@ -518,8 +518,8 @@ if (get_option('efl-one'))
foreach package : subprojects
package_name = package[0]
if package[1].length() == 0 or get_option(package[1][0])
- if (package[3])
- if (package[8] and get_option('efl-one'))
+ if package[3]
+ if package[8] and get_option('efl-one')
set_variable(package_name, efl_one)
endif
endif
@@ -538,17 +538,17 @@ foreach package : subprojects
'-DNEED_RUN_IN_TREE=1',
'-DEFL_BUILD=1',
]
- if (package[2])
+ if package[2]
subdir(local_module / package_name)
endif
package_c_args = [
'-DPACKAGE_DATA_DIR="' + dir_data / package_name + '"',
'-DNEED_RUN_IN_TREE=1',
]
- if (package[4] and package_name != 'eolian')
+ if package[4] and package_name != 'eolian'
subdir(local_bin / package_name)
endif
- if (package[5])
+ if package[5]
subdir(local_benchmark / package_name)
endif
endif
@@ -564,7 +564,7 @@ subdir('data')
if get_option('build-tests')
check = dependency('check')
- if (check.version() == '0.15.1')
+ if check.version() == '0.15.1'
error('There is a bug in check@0.15.1 which does not allow efl to be compiled with it. Please downgrade / upgrade or disable tests')
endif
diff --git a/meson/header_checks/meson.build b/meson/header_checks/meson.build
index 5180eb8c57..c8042f0ff8 100644
--- a/meson/header_checks/meson.build
+++ b/meson/header_checks/meson.build
@@ -205,7 +205,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
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index d1745bd36c..8860fb0c75 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -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 = dir_lib / 'efl-mono-'+version_major
efl_mono_xml_doc = 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',
diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index ff57a6e29e..dd7fe33433 100644
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -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',
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index 873074f841..270f3bf10d 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -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
diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build
index 6727abc2a2..f9ff062d9a 100644
--- a/src/lib/eeze/meson.build
+++ b/src/lib/eeze/meson.build
@@ -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'
diff --git a/src/lib/efl_canvas_wl/meson.build b/src/lib/efl_canvas_wl/meson.build
index 8c8559ee54..6494a0c87b 100644
--- a/src/lib/efl_canvas_wl/meson.build
+++ b/src/lib/efl_canvas_wl/meson.build
@@ -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
diff --git a/src/lib/emile/meson.build b/src/lib/emile/meson.build
index b4b8bec694..9386130760 100644
--- a/src/lib/emile/meson.build
+++ b/src/lib/emile/meson.build
@@ -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
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index f5ea4b3be6..f65c0e13ae 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -155,17 +155,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')
@@ -173,7 +173,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 not hyphen.found()
diff --git a/src/static_libs/libunibreak/meson.build b/src/static_libs/libunibreak/meson.build
index 4af3b441d8..407ed9f3e7 100644
--- a/src/static_libs/libunibreak/meson.build
+++ b/src/static_libs/libunibreak/meson.build
@@ -1,4 +1,4 @@
-if (get_option('embedded-libunibreak'))
+if get_option('embedded-libunibreak')
libunibreak_src = [
'unibreakbase.h',
'unibreakdef.h',
@@ -28,7 +28,7 @@ if (get_option('embedded-libunibreak'))
libunibreak = declare_dependency(
include_directories: include_directories('.'),
link_with: libunibreak_lib,
- dependencies: [eina],
+ dependencies: eina,
)
else
libunibreak = dependency('libunibreak', version : '>=4.2')
diff --git a/src/static_libs/lz4/meson.build b/src/static_libs/lz4/meson.build
index ac99854a25..00bd195e2a 100644
--- a/src/static_libs/lz4/meson.build
+++ b/src/static_libs/lz4/meson.build
@@ -1,4 +1,4 @@
-if (get_option('embedded-lz4'))
+if get_option('embedded-lz4')
lz4_src = [
'lz4.c',
'lz4hc.c',
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
