bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=1c499deedc0b6cd371df6b027e8be4269ea5c501
commit 1c499deedc0b6cd371df6b027e8be4269ea5c501 Author: Marcel Hollerbach <[email protected]> Date: Wed Dec 27 19:36:27 2017 +0000 meson: ecore with modules long story short, ecore modules require eldbus ... --- meson.build | 1 + src/modules/ecore/meson.build | 3 +++ src/modules/ecore/system/systemd/meson.build | 5 +++++ src/modules/ecore/system/tizen/meson.build | 5 +++++ src/modules/ecore/system/upower/meson.build | 5 +++++ src/tests/ecore/meson.build | 28 +++++++++++++++++++++++++++- 6 files changed, 46 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5076a77b4a..a7f350e816 100644 --- a/meson.build +++ b/meson.build @@ -88,6 +88,7 @@ subprojects = [ ['eet' , false, true, true, false, []], ['ecore' , false, true, false, false, []], ['eldbus', false, true, true, false, []], +['ecore' , true, false, false, false, []], #ecores modules depend on eldbus ['ecore_audio' , false, true, false, false, []], ] diff --git a/src/modules/ecore/meson.build b/src/modules/ecore/meson.build new file mode 100644 index 0000000000..6191853d21 --- /dev/null +++ b/src/modules/ecore/meson.build @@ -0,0 +1,3 @@ +subdir(join_paths('system', 'systemd')) +subdir(join_paths('system', 'tizen')) +subdir(join_paths('system', 'upower')) \ No newline at end of file diff --git a/src/modules/ecore/system/systemd/meson.build b/src/modules/ecore/system/systemd/meson.build new file mode 100644 index 0000000000..faf64bc234 --- /dev/null +++ b/src/modules/ecore/system/systemd/meson.build @@ -0,0 +1,5 @@ +ecore_systemd_mod = shared_module('ecore-systemd', + 'ecore_system_systemd.c', + dependencies: [ecore, eldbus], + install: true, +) \ No newline at end of file diff --git a/src/modules/ecore/system/tizen/meson.build b/src/modules/ecore/system/tizen/meson.build new file mode 100644 index 0000000000..9832f6d5d1 --- /dev/null +++ b/src/modules/ecore/system/tizen/meson.build @@ -0,0 +1,5 @@ +ecore_systemd_mod = shared_module('ecore-tizen', + 'ecore_system_tizen.c', + dependencies: [ecore, eldbus], + install: true, +) \ No newline at end of file diff --git a/src/modules/ecore/system/upower/meson.build b/src/modules/ecore/system/upower/meson.build new file mode 100644 index 0000000000..0f960590ca --- /dev/null +++ b/src/modules/ecore/system/upower/meson.build @@ -0,0 +1,5 @@ +ecore_systemd_mod = shared_module('ecore-upower', + 'ecore_system_upower.c', + dependencies: [ecore, eldbus], + install: true, +) \ No newline at end of file diff --git a/src/tests/ecore/meson.build b/src/tests/ecore/meson.build index ce9ab5a686..7e324bc751 100644 --- a/src/tests/ecore/meson.build +++ b/src/tests/ecore/meson.build @@ -16,9 +16,35 @@ ecore_suite_src = [ 'ecore_suite.h' ] +ecore_suite_deps = [m] +ecore_suite_deps += ecore +ecore_suite_deps += ecore_file +ecore_suite_deps += ecore_evas +ecore_suite_deps += ecore_input +ecore_suite_deps += ecore_imf + +if get_option('ecore_audio') + ecore_suite_deps += ecore_audio + ecore_suite_src += 'ecore_test_ecore_audio.c' +endif + +if get_option('ecore_fb') + ecore_suite_deps += ecore_fb + ecore_suite_src += 'ecore_test_ecore_fb.c' +endif + +if get_option('ecore_drm2') + ecore_suite_deps += ecore_drm2 +endif + +if get_option('ecore_x') + ecore_suite_src += 'ecore_test_ecore_x.c' + ecore_suite_deps += ecore_x +endif + ecore_suite = executable('ecore_suite', ecore_suite_src, - dependencies: [ecore, ecore_imf, ecore_evas, ecore_input, ecore_file, check], + dependencies: [ecore_suite_deps, check], c_args : [ '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] --
