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 a5d78fd599a231b261f8a6fa2c63d2d65dd69f08
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 21 09:18:39 2024 +0500
meson: change all external dependencies from 'lib' to 'lib_dep'
---
meson.build | 4 ++--
src/bin/edje/meson.build | 2 +-
src/lib/ecore_con/meson.build | 2 +-
src/lib/edje/meson.build | 2 +-
src/lib/eet/meson.build | 2 +-
src/lib/elua/meson.build | 2 +-
src/lib/emile/meson.build | 4 ++--
src/lib/evas/filters/meson.build | 2 +-
src/lib/evas/meson.build | 6 +++---
src/tests/ecore/meson.build | 4 ++--
src/tests/ecore_con/meson.build | 2 +-
src/tests/ecore_cxx/meson.build | 6 +++---
src/tests/ecore_wl2/meson.build | 2 +-
src/tests/ector/suite/meson.build | 2 +-
src/tests/edje/meson.build | 2 +-
src/tests/edje_cxx/meson.build | 4 ++--
src/tests/eet/meson.build | 2 +-
src/tests/eet_cxx/meson.build | 4 ++--
src/tests/eeze/meson.build | 2 +-
src/tests/efl/meson.build | 2 +-
src/tests/efl_mono/meson.build | 2 +-
src/tests/efreet/meson.build | 4 ++--
src/tests/eina/meson.build | 2 +-
src/tests/eina_cxx/meson.build | 4 ++--
src/tests/eio/meson.build | 2 +-
src/tests/eldbus/meson.build | 2 +-
src/tests/eldbus_cxx/meson.build | 4 ++--
src/tests/elementary/meson.build | 4 ++--
src/tests/elementary/spec/meson.build | 2 +-
src/tests/elementary_cxx/meson.build | 4 ++--
src/tests/elput/meson.build | 2 +-
src/tests/elua/meson.build | 4 ++--
src/tests/emile/meson.build | 2 +-
src/tests/eo/suite/meson.build | 6 +++---
src/tests/eo_cxx/meson.build | 4 ++--
src/tests/eolian/meson.build | 2 +-
src/tests/eolian_cxx/meson.build | 4 ++--
src/tests/evas/meson.build | 2 +-
src/tests/evas_cxx/meson.build | 4 ++--
39 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/meson.build b/meson.build
index d6c2f54810..c95a6f3d74 100644
--- a/meson.build
+++ b/meson.build
@@ -470,8 +470,8 @@ configure_file(
configuration: efl_config_h
)
-subdir('services/systemd-services')
-subdir('services/dbus-services')
+subdir('services/systemd')
+subdir('services/dbus')
#output the three new efl-* .pc files
efl_20_pc_files = {
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 9a70649c21..5f1a1534af 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -2,7 +2,7 @@ subdir('epp')
edje_bin_deps = [
eina, eo, efl, m,
- lua, eet, evas,
+ lua_dep, eet, evas,
ecore_file, ecore_input,
ecore_imf, ecore_imf_evas,
embryo, efreet, eio,
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index 61781503fd..f3dbd16b68 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -183,7 +183,7 @@ else
ecore_con_deps += eldbus
endif
-ecore_con_ext_deps += crypto
+ecore_con_ext_deps += crypto_dep
ecore_con_lib = library('ecore_con',
ecore_con_src, pub_eo_file_target,
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index af40b91961..1a24cbb3f6 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -8,7 +8,7 @@ edje_deps = [
]
edje_pub_deps = [evas, eo, efl]
-edje_ext_deps = [m, lua, buildsystem_simple]
+edje_ext_deps = [m, lua_dep, buildsystem_simple]
if get_option('physics')
edje_deps += ephysics
diff --git a/src/lib/eet/meson.build b/src/lib/eet/meson.build
index a788dbe6bd..87f1e607ef 100644
--- a/src/lib/eet/meson.build
+++ b/src/lib/eet/meson.build
@@ -1,6 +1,6 @@
eet_deps = [rg_etc]
eet_pub_deps = [eina, emile, efl]
-eet_ext_deps = [crypto, jpeg, m, rg_etc_simple]
+eet_ext_deps = [crypto_dep, jpeg_dep, m, rg_etc_simple]
eet_header_src = [
'Eet.h'
diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build
index a9dff1b3d6..39d48b1696 100644
--- a/src/lib/elua/meson.build
+++ b/src/lib/elua/meson.build
@@ -1,5 +1,5 @@
elua_deps = [eina, eo, efl, ecore, ecore_file, intl]
-elua_pub_deps = [lua]
+elua_pub_deps = [lua_dep]
elua_src = ['elua.c', 'io.c', 'cache.c']
elua_header_src = ['Elua.h']
diff --git a/src/lib/emile/meson.build b/src/lib/emile/meson.build
index 9386130760..3762904cee 100644
--- a/src/lib/emile/meson.build
+++ b/src/lib/emile/meson.build
@@ -1,6 +1,6 @@
emile_deps = []
emile_pub_deps = [eina, efl]
-emile_ext_deps = [jpeg, crypto, dependency('zlib'), lz4, rg_etc, m]
+emile_ext_deps = [jpeg_dep, crypto_dep, dependency('zlib'), lz4, rg_etc, m]
emile_headers = [
'Emile.h',
@@ -18,7 +18,7 @@ emile_src = files(
'emile_base64.c',
)
-if get_option('crypto') == 'openssl'
+if CRYPTO == 'openssl'
emile_src += files('emile_cipher_openssl.c')
endif
diff --git a/src/lib/evas/filters/meson.build b/src/lib/evas/filters/meson.build
index 8dc0430436..17cd2f1f8f 100644
--- a/src/lib/evas/filters/meson.build
+++ b/src/lib/evas/filters/meson.build
@@ -7,4 +7,4 @@ evas_src += files(
'evas_filter_utils.c',
)
-evas_deps += lua
+evas_deps += lua_dep
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 642fc75d44..64d80dd582 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -23,7 +23,7 @@ evas_image_loaders_file = [
['gif', 'shared', [giflib]],
['heif', 'shared', []],
['ico', 'shared', []],
- ['jpeg', 'static', [jpeg]],
+ ['jpeg', 'static', [jpeg_dep]],
['jp2k', 'shared', [libopenjp2]],
['jxl', 'shared', [libjxl, libjxl_threads]],
['pmaps', 'shared', []],
@@ -41,7 +41,7 @@ evas_image_loaders_file = [
evas_image_savers_file = [
['avif', 'shared', [libavif]],
['eet', 'static', [eet]],
- ['jpeg', 'static', [jpeg]],
+ ['jpeg', 'static', [jpeg_dep]],
['jxl' , 'shared', [libjxl, libjxl_threads]],
['png', 'static', [png]],
['qoi', 'shared', []],
@@ -62,7 +62,7 @@ evas_vg_savers_file = ['eet', 'svg']
rel_evas_modules = '../../../modules/evas/engines/software_generic'
evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem]
evas_ext_deps = [vg_common, draw_simple]
-evas_ext_none_static_deps = [buildsystem_simple, intl, m, valgrind, libunibreak, lua]
+evas_ext_none_static_deps = [buildsystem_simple, intl, m, valgrind, libunibreak, lua_dep]
pub_eo_file_target = []
priv_eo_files = []
diff --git a/src/tests/ecore/meson.build b/src/tests/ecore/meson.build
index fe989f0c11..5b89937496 100644
--- a/src/tests/ecore/meson.build
+++ b/src/tests/ecore/meson.build
@@ -64,7 +64,7 @@ endif
ecore_suite = executable('ecore_suite',
ecore_suite_src,
- dependencies: [ecore_suite_deps, check],
+ dependencies: [ecore_suite_deps, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
@@ -103,7 +103,7 @@ efl_app_suite_deps += ecore
efl_app_suite = executable('efl_app_suite',
efl_app_suite_src, priv_eo_file_target,
- dependencies: [efl_app_suite_deps, check],
+ dependencies: [efl_app_suite_deps, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/ecore_con/meson.build b/src/tests/ecore_con/meson.build
index a4f8dffbc4..0d66732cd8 100644
--- a/src/tests/ecore_con/meson.build
+++ b/src/tests/ecore_con/meson.build
@@ -9,7 +9,7 @@ ecore_con_suite_src = [
ecore_con_suite = executable('ecore_con_suite',
ecore_con_suite_src,
- dependencies: [ecore_con, eet, ecore, check],
+ dependencies: [ecore_con, eet, ecore, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/ecore_cxx/meson.build b/src/tests/ecore_cxx/meson.build
index 9c88552418..bb1490a375 100644
--- a/src/tests/ecore_cxx/meson.build
+++ b/src/tests/ecore_cxx/meson.build
@@ -1,4 +1,4 @@
-ecore_cxx_suite_deps = [check, ecore_cxx]
+ecore_cxx_suite_deps = [check_dep, ecore_cxx]
ecore_cxx_suite_src = [
'ecore_cxx_suite.cc',
@@ -9,7 +9,7 @@ ecore_cxx_suite_src = [
ecore_cxx_suite = executable('ecore_cxx_suite',
ecore_cxx_suite_src,
- dependencies: [ecore_cxx_suite_deps, check],
+ dependencies: [ecore_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
@@ -17,7 +17,7 @@ ecore_cxx_suite = executable('ecore_cxx_suite',
executable('ecore_cxx_suite_compile_test',
'cxx_compile_test.cc',
- dependencies: [ecore_cxx_suite_deps, check],
+ dependencies: [ecore_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/ecore_wl2/meson.build b/src/tests/ecore_wl2/meson.build
index 5ab6880872..f289e064ae 100644
--- a/src/tests/ecore_wl2/meson.build
+++ b/src/tests/ecore_wl2/meson.build
@@ -19,7 +19,7 @@ endif
ecore_wl2_suite = executable('ecore_wl2_suite',
ecore_wl2_suite_src,
- dependencies: [ecore_wl2, ecore, ecore_input, check, wayland_protocol, wayland_client, dependency('wayland-egl'), wl2_test_gl_deps],
+ dependencies: [ecore_wl2, ecore, ecore_input, check_dep, wayland_protocol, wayland_client, dependency('wayland-egl'), wl2_test_gl_deps],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/tests/ector/suite/meson.build b/src/tests/ector/suite/meson.build
index 23335695d9..387f29b8c4 100644
--- a/src/tests/ector/suite/meson.build
+++ b/src/tests/ector/suite/meson.build
@@ -7,7 +7,7 @@ ector_suite_src = [
ector_suite = executable('ector_suite',
ector_suite_src,
include_directories : include_directories('..'),
- dependencies: [eo, ector, check],
+ dependencies: [eo, ector, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/edje/meson.build b/src/tests/edje/meson.build
index 3f9a70e3b1..4b98148848 100644
--- a/src/tests/edje/meson.build
+++ b/src/tests/edje/meson.build
@@ -17,7 +17,7 @@ edje_suite_src = [
edje_suite = executable('edje_suite',
edje_suite_src, themes,
- dependencies: [check, eina, ecore_evas, edje, efreet],
+ dependencies: [check_dep, eina, ecore_evas, edje, efreet],
include_directories : config_dir,
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/tests/edje_cxx/meson.build b/src/tests/edje_cxx/meson.build
index 0d706a294f..fd4054f98f 100644
--- a/src/tests/edje_cxx/meson.build
+++ b/src/tests/edje_cxx/meson.build
@@ -1,8 +1,8 @@
-edje_cxx_suite_deps = [check, edje_cxx]
+edje_cxx_suite_deps = [check_dep, edje_cxx]
executable('edje_cxx_suite_compile_test',
'cxx_compile_test.cc',
- dependencies: [edje_cxx_suite_deps, check],
+ dependencies: [edje_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/eet/meson.build b/src/tests/eet/meson.build
index 1ddf518667..a27f76c254 100644
--- a/src/tests/eet/meson.build
+++ b/src/tests/eet/meson.build
@@ -15,7 +15,7 @@ eet_suite_src = [
eet_suite = executable('eet_suite',
eet_suite_src,
- dependencies: [eet, check],
+ dependencies: [eet, check_dep],
c_args : [
'-DTESTS_WD="`pwd`"',
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/tests/eet_cxx/meson.build b/src/tests/eet_cxx/meson.build
index 9b5b1b0145..60320e61f9 100644
--- a/src/tests/eet_cxx/meson.build
+++ b/src/tests/eet_cxx/meson.build
@@ -1,4 +1,4 @@
-eet_cxx_suite_deps = [check, eet_cxx]
+eet_cxx_suite_deps = [check_dep, eet_cxx]
eet_cxx_suite_src = [
'eet_cxx_suite.cc',
@@ -8,7 +8,7 @@ eet_cxx_suite_src = [
eet_cxx_suite = executable('eet_cxx_suite',
eet_cxx_suite_src,
- dependencies: [eet_cxx_suite_deps, check],
+ dependencies: [eet_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/eeze/meson.build b/src/tests/eeze/meson.build
index 540a077d63..b56ed9dbeb 100644
--- a/src/tests/eeze/meson.build
+++ b/src/tests/eeze/meson.build
@@ -9,7 +9,7 @@ eeze_suite_src = [
eeze_suite = executable('eeze_suite',
eeze_suite_src,
- dependencies: [eeze, ecore, check],
+ dependencies: [eeze, ecore, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/efl/meson.build b/src/tests/efl/meson.build
index b3ba6b3eb2..1b48effbd9 100644
--- a/src/tests/efl/meson.build
+++ b/src/tests/efl/meson.build
@@ -7,7 +7,7 @@ efl_suite_src = [
efl_suite_bin = executable('efl_suite',
efl_suite_src,
- dependencies: [efl, ecore, check],
+ dependencies: [efl, ecore, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build
index 272abe7ef6..850cc682ae 100644
--- a/src/tests/efl_mono/meson.build
+++ b/src/tests/efl_mono/meson.build
@@ -180,7 +180,7 @@ endif
eolian_mono_helpers_suite = executable('eolian-mono-suite',
['eolian_mono_suite.cc'],
include_directories : config_dir,
- dependencies: [check, eolian_cxx, eina_cxx],
+ dependencies: [check_dep, eolian_cxx, eina_cxx],
cpp_args : package_c_args + [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/efreet/meson.build b/src/tests/efreet/meson.build
index 954f6b22b4..498f20ed68 100644
--- a/src/tests/efreet/meson.build
+++ b/src/tests/efreet/meson.build
@@ -7,7 +7,7 @@ efreet_suite_src = [
efreet_suite = executable('efreet_suite',
efreet_suite_src,
- dependencies: [check, efreet],
+ dependencies: [check_dep, efreet],
include_directories : config_dir,
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
@@ -32,7 +32,7 @@ efreet_test_src = [
'main.c'
]
-efreet_test_deps = [check, efreet, ecore, ecore_file, intl]
+efreet_test_deps = [check_dep, efreet, ecore, ecore_file, intl]
efreet_test = executable('efreet_test',
efreet_test_src,
diff --git a/src/tests/eina/meson.build b/src/tests/eina/meson.build
index 6195515e36..421d301de9 100644
--- a/src/tests/eina/meson.build
+++ b/src/tests/eina/meson.build
@@ -63,7 +63,7 @@ eina_test_src = files(
eina_test_exe = executable('eina_suite',
include_directories : config_dir,
sources : eina_test_src,
- dependencies: [m, check, eina],
+ dependencies: [m, check_dep, eina],
c_args : [
'-DTESTS_WD="`pwd`"',
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/tests/eina_cxx/meson.build b/src/tests/eina_cxx/meson.build
index 93f4b03aa1..41bc8edb3e 100644
--- a/src/tests/eina_cxx/meson.build
+++ b/src/tests/eina_cxx/meson.build
@@ -1,4 +1,4 @@
-eina_cxx_suite_deps = [check]
+eina_cxx_suite_deps = [check_dep]
eina_cxx_suite_src = [
'eina_cxx_suite.cc',
@@ -42,7 +42,7 @@ endforeach
eina_cxx_suite = executable('eina_cxx_suite',
eina_cxx_suite_src + priv_eo_file_target,
include_directories : config_dir,
- dependencies: [eina_cxx_suite_deps, check, eina, eina_cxx, eo_cxx, ecore],
+ dependencies: [eina_cxx_suite_deps, check_dep, eina, eina_cxx, eo_cxx, ecore],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'
diff --git a/src/tests/eio/meson.build b/src/tests/eio/meson.build
index df082356a7..7eb8f96b71 100644
--- a/src/tests/eio/meson.build
+++ b/src/tests/eio/meson.build
@@ -18,7 +18,7 @@ eio_suite_src = [
eio_suite = executable('eio_suite',
eio_suite_src,
include_directories : [config_dir],
- dependencies: [eo, ecore, eina, ecore_file, eio, check, efreet],
+ 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()+'"']
diff --git a/src/tests/eldbus/meson.build b/src/tests/eldbus/meson.build
index 950e72d006..78ef939508 100644
--- a/src/tests/eldbus/meson.build
+++ b/src/tests/eldbus/meson.build
@@ -21,7 +21,7 @@ eldbus_suite_src = [
eldbus_suite = executable('eldbus_suite',
eldbus_suite_src,
- dependencies: [eldbus, ecore, check],
+ dependencies: [eldbus, ecore, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/eldbus_cxx/meson.build b/src/tests/eldbus_cxx/meson.build
index 23b955958f..f3dcf17be7 100644
--- a/src/tests/eldbus_cxx/meson.build
+++ b/src/tests/eldbus_cxx/meson.build
@@ -1,4 +1,4 @@
-eldbus_cxx_suite_deps = [check, eldbus_cxx]
+eldbus_cxx_suite_deps = [check_dep, eldbus_cxx]
eldbus_cxx_suite_src = [
'eldbus_cxx_suite.cc',
@@ -9,7 +9,7 @@ eldbus_cxx_suite_src = [
eldbus_cxx_suite = executable('eldbus_cxx_suite',
eldbus_cxx_suite_src,
- dependencies: [eldbus_cxx_suite_deps, check],
+ dependencies: [eldbus_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 9ee36d7848..f547dc3cfb 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -108,7 +108,7 @@ elementary_suite_src = [
elementary_suite = executable('elementary_suite',
elementary_suite_src,
- dependencies: [check, eina, elementary, elementary_deps, intl],
+ dependencies: [check_dep, eina, elementary, elementary_deps, intl],
include_directories : [config_dir] + [elementary_config_dir],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
@@ -172,7 +172,7 @@ efl_ui_suite_src = [
efl_ui_suite = executable('efl_ui_suite',
efl_ui_suite_src, priv_eo_file_target,
- dependencies: [check, eina, elementary, elementary_deps, intl],
+ dependencies: [check_dep, eina, elementary, elementary_deps, intl],
include_directories : [config_dir] + [elementary_config_dir],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/tests/elementary/spec/meson.build b/src/tests/elementary/spec/meson.build
index effad93c80..f19932fdbe 100644
--- a/src/tests/elementary/spec/meson.build
+++ b/src/tests/elementary/spec/meson.build
@@ -33,7 +33,7 @@ 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, eina, elementary, elementary_deps],
+ dependencies: [check_dep, eina, elementary, elementary_deps],
include_directories : [config_dir] + [elementary_config_dir] + [include_directories('../')],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/tests/elementary_cxx/meson.build b/src/tests/elementary_cxx/meson.build
index 1ced02bdca..7a52ba8a5b 100644
--- a/src/tests/elementary_cxx/meson.build
+++ b/src/tests/elementary_cxx/meson.build
@@ -1,8 +1,8 @@
-elementary_cxx_suite_deps = [check, elementary_cxx]
+elementary_cxx_suite_deps = [check_dep, elementary_cxx]
executable('elementary_cxx_suite_compile_test',
['cxx_compile_test.cc', 'cxx_dummy_compile_test.cc'],
- dependencies: [elementary_cxx_suite_deps, check],
+ dependencies: [elementary_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/elput/meson.build b/src/tests/elput/meson.build
index 529ffa18c2..3fe3569693 100644
--- a/src/tests/elput/meson.build
+++ b/src/tests/elput/meson.build
@@ -6,7 +6,7 @@ elput_suite_src = [
elput_suite = executable('elput_suite',
elput_suite_src,
- dependencies: [elput, ecore, check],
+ dependencies: [elput, ecore, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/elua/meson.build b/src/tests/elua/meson.build
index 49f93f0a22..3d2b2a31f3 100644
--- a/src/tests/elua/meson.build
+++ b/src/tests/elua/meson.build
@@ -1,4 +1,4 @@
-elua_suite_deps = [check, eina, elua]
+elua_suite_deps = [check_dep, eina, elua]
elua_suite_src = [
'elua_suite.c',
@@ -14,7 +14,7 @@ elua_apps_dir = meson.source_root() / 'src/tests/elua/data/apps'
elua_suite = executable('elua_suite',
elua_suite_src,
include_directories : config_dir,
- dependencies: [elua_suite_deps, check],
+ dependencies: [elua_suite_deps, check_dep],
c_args : [
'-DELUA_BINDINGS_DIR="'+elua_bindings_dir+'"',
'-DELUA_CORE_DIR="'+elua_core_dir+'"',
diff --git a/src/tests/emile/meson.build b/src/tests/emile/meson.build
index 47fb236e52..953c93d75c 100644
--- a/src/tests/emile/meson.build
+++ b/src/tests/emile/meson.build
@@ -7,7 +7,7 @@ emile_suite_src = [
emile_suite = executable('emile_suite',
emile_suite_src,
- dependencies: [emile, check],
+ dependencies: [emile, check_dep],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/eo/suite/meson.build b/src/tests/eo/suite/meson.build
index a0249c5c8a..6d1c9df7d2 100644
--- a/src/tests/eo/suite/meson.build
+++ b/src/tests/eo/suite/meson.build
@@ -23,7 +23,7 @@ eo_suite_src = [
eo_suite = executable('eo_suite',
eo_suite_src,
- dependencies: [eo, check, valgrind],
+ dependencies: [eo, check_dep, valgrind],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
@@ -36,7 +36,7 @@ test('eo-suite', eo_suite,
eo_suite = executable('eo_suite_dbg',
eo_suite_src,
- dependencies: [eo_dbg, check, valgrind],
+ dependencies: [eo_dbg, check_dep, valgrind],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DEO_DEBUG=1',
@@ -50,7 +50,7 @@ test('eo-suite-dbg', eo_suite,
eo_suite = executable('eo_suite_fallback',
eo_suite_src,
- dependencies: [eo_dbg, check, valgrind],
+ dependencies: [eo_dbg, check_dep, valgrind],
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DEO_DEBUG=1',
diff --git a/src/tests/eo_cxx/meson.build b/src/tests/eo_cxx/meson.build
index eaacac6a17..79ddd8f5e7 100644
--- a/src/tests/eo_cxx/meson.build
+++ b/src/tests/eo_cxx/meson.build
@@ -1,4 +1,4 @@
-eo_cxx_suite_deps = [check, eina_cxx, eo_cxx]
+eo_cxx_suite_deps = [check_dep, eina_cxx, eo_cxx]
eo_cxx_suite_src = [
'eo_cxx_suite.cc',
@@ -8,7 +8,7 @@ eo_cxx_suite_src = [
eo_cxx_suite = executable('eo_cxx_suite',
eo_cxx_suite_src,
include_directories : config_dir,
- dependencies: [eo_cxx_suite_deps, check],
+ dependencies: [eo_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
diff --git a/src/tests/eolian/meson.build b/src/tests/eolian/meson.build
index 55f764493f..fb7c2d0be0 100644
--- a/src/tests/eolian/meson.build
+++ b/src/tests/eolian/meson.build
@@ -28,7 +28,7 @@ endforeach
eolian_suite = executable('eolian_suite',
eolian_test_src, priv_eo_file_target,
- dependencies: [eolian, check, eo],
+ dependencies: [eolian, check_dep, eo],
c_args : [
'-DEOLIAN_GEN="'+eolian_gen_path+'"',
'-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
diff --git a/src/tests/eolian_cxx/meson.build b/src/tests/eolian_cxx/meson.build
index 79fa91892e..ae9e7a2c30 100644
--- a/src/tests/eolian_cxx/meson.build
+++ b/src/tests/eolian_cxx/meson.build
@@ -1,4 +1,4 @@
-eolian_cxx_suite_deps = [check, eolian_cxx, eina_cxx, eo_cxx, ecore]
+eolian_cxx_suite_deps = [check_dep, eolian_cxx, eina_cxx, eo_cxx, ecore]
eolian_cxx_suite_src = files(
'eolian_cxx_suite.cc',
@@ -61,7 +61,7 @@ endforeach
eolian_cxx_suite = executable('eolian_cxx_suite',
eolian_cxx_suite_src + pub_eo_file_target,
- dependencies: [eolian_cxx_suite_deps, eo_cxx, check],
+ dependencies: [eolian_cxx_suite_deps, eo_cxx, check_dep],
# package_c_args contains -D definitions for the package
cpp_args : package_c_args +[
'-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
diff --git a/src/tests/evas/meson.build b/src/tests/evas/meson.build
index 4b5be4d82e..bcc486e68d 100644
--- a/src/tests/evas/meson.build
+++ b/src/tests/evas/meson.build
@@ -26,7 +26,7 @@ evas_suite_src = [
evas_suite = executable('evas_suite',
evas_suite_src,
- dependencies: [evas_bin, evas, ecore_evas, dl, check, evas_ext_none_static_deps, eet], #external deps needed here since tests do include internal headers
+ dependencies: [evas_bin, evas, ecore_evas, dl, check_dep, evas_ext_none_static_deps, eet], #external deps needed here since tests do include internal headers
include_directories: include_directories('../../modules/evas/engines/buffer'),
c_args : [
'-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
diff --git a/src/tests/evas_cxx/meson.build b/src/tests/evas_cxx/meson.build
index d84c1e2c12..9469ee75de 100644
--- a/src/tests/evas_cxx/meson.build
+++ b/src/tests/evas_cxx/meson.build
@@ -1,8 +1,8 @@
-evas_cxx_suite_deps = [check, evas_cxx]
+evas_cxx_suite_deps = [check_dep, evas_cxx]
executable('evas_cxx_suite_compile_test',
'cxx_compile_test.cc',
- dependencies: [evas_cxx_suite_deps, check],
+ dependencies: [evas_cxx_suite_deps, check_dep],
cpp_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
