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 2267e09f37abd7c5d826dc1f8675acb63368e247
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 21 13:03:49 2024 +0500
meson: cleanup
---
src/lib/evil/meson.build | 2 +-
src/tests/eio/meson.build | 7 ++++---
src/tests/elementary/meson.build | 28 ++++++++++++++--------------
src/tests/elementary/spec/meson.build | 10 +++++-----
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index ef9a326519..cfe1a17c45 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -32,7 +32,7 @@ if target_machine.system() == 'windows'
evil_lib = library('evil', evil_src,
c_args : [package_c_args, '-DEVIL_BUILD'],
dependencies : evil_ext_deps,
- include_directories : [config_dir],
+ include_directories : config_dir,
install: true,
version: efl_version,
)
diff --git a/src/tests/eio/meson.build b/src/tests/eio/meson.build
index 7eb8f96b71..d465468604 100644
--- a/src/tests/eio/meson.build
+++ b/src/tests/eio/meson.build
@@ -17,11 +17,12 @@ eio_suite_src = [
eio_suite = executable('eio_suite',
eio_suite_src,
- include_directories : [config_dir],
+ include_directories : config_dir,
dependencies: [eo, ecore, eina, ecore_file, eio, check_dep, efreet],
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
+ '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
+ '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'
+ ]
)
test('eio-suite', eio_suite,
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index f547dc3cfb..187475dc10 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -21,7 +21,7 @@ foreach eo_file : priv_eo_files
endforeach
-elementary_suite_src = [
+elementary_suite_src = files(
'elm_suite.c',
'elm_suite_build.c',
'suite_helpers.c',
@@ -104,21 +104,21 @@ elementary_suite_src = [
'elm_code_test_widget_undo.c',
'elm_test_widget_focus.c',
'elm_test_widget_basics.c'
-]
+)
elementary_suite = executable('elementary_suite',
elementary_suite_src,
dependencies: [check_dep, eina, elementary, elementary_deps, intl],
- include_directories : [config_dir] + [elementary_config_dir],
+ include_directories : config_dir + [elementary_config_dir],
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
- '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"',
+ '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
+ '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
]
)
-efl_ui_suite_src = [
+efl_ui_suite_src = files(
'efl_ui_suite.c',
'efl_ui_build.c',
'suite_helpers.c',
@@ -168,17 +168,17 @@ efl_ui_suite_src = [
'custom_gesture.c',
'custom_recognizer.c',
'custom_recognizer2.c',
-]
+)
efl_ui_suite = executable('efl_ui_suite',
efl_ui_suite_src, priv_eo_file_target,
dependencies: [check_dep, eina, elementary, elementary_deps, intl],
- include_directories : [config_dir] + [elementary_config_dir],
+ include_directories : config_dir + [elementary_config_dir],
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
- '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"',
+ '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
+ '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
]
)
diff --git a/src/tests/elementary/spec/meson.build b/src/tests/elementary/spec/meson.build
index f19932fdbe..b36e18adc0 100644
--- a/src/tests/elementary/spec/meson.build
+++ b/src/tests/elementary/spec/meson.build
@@ -34,12 +34,12 @@ generated_test_parts = custom_target('generate_test_suite',
efl_ui_behavior_suite = executable('efl_ui_spec_suite',
efl_ui_suite_behavior_src + [generated_test_parts] + [priv_eo_file_target],
dependencies: [check_dep, eina, elementary, elementary_deps],
- include_directories : [config_dir] + [elementary_config_dir] + [include_directories('../')],
+ include_directories : config_dir + [elementary_config_dir] + [include_directories('../')],
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
- '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"',
+ '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
+ '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
]
)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
