summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-12-27 19:36:27 +0000
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-03-27 17:50:01 +0100
commit1c499deedc0b6cd371df6b027e8be4269ea5c501 (patch)
treebc4ed7be659b9ae6f730785637aa76abfdbffd50
parent4eee3412ecc05c6e89b914bf2766bfff8c64f770 (diff)
meson: ecore with modules
long story short, ecore modules require eldbus ...
-rw-r--r--meson.build1
-rw-r--r--src/modules/ecore/meson.build3
-rw-r--r--src/modules/ecore/system/systemd/meson.build5
-rw-r--r--src/modules/ecore/system/tizen/meson.build5
-rw-r--r--src/modules/ecore/system/upower/meson.build5
-rw-r--r--src/tests/ecore/meson.build28
6 files changed, 46 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 5076a77b4a..a7f350e816 100644
--- a/meson.build
+++ b/meson.build
@@ -88,6 +88,7 @@ subprojects = [
88['eet' , false, true, true, false, []], 88['eet' , false, true, true, false, []],
89['ecore' , false, true, false, false, []], 89['ecore' , false, true, false, false, []],
90['eldbus', false, true, true, false, []], 90['eldbus', false, true, true, false, []],
91['ecore' , true, false, false, false, []], #ecores modules depend on eldbus
91['ecore_audio' , false, true, false, false, []], 92['ecore_audio' , false, true, false, false, []],
92] 93]
93 94
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 @@
1subdir(join_paths('system', 'systemd'))
2subdir(join_paths('system', 'tizen'))
3subdir(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 @@
1ecore_systemd_mod = shared_module('ecore-systemd',
2 'ecore_system_systemd.c',
3 dependencies: [ecore, eldbus],
4 install: true,
5) \ 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 @@
1ecore_systemd_mod = shared_module('ecore-tizen',
2 'ecore_system_tizen.c',
3 dependencies: [ecore, eldbus],
4 install: true,
5) \ 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 @@
1ecore_systemd_mod = shared_module('ecore-upower',
2 'ecore_system_upower.c',
3 dependencies: [ecore, eldbus],
4 install: true,
5) \ 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 = [
16 'ecore_suite.h' 16 'ecore_suite.h'
17] 17]
18 18
19ecore_suite_deps = [m]
20ecore_suite_deps += ecore
21ecore_suite_deps += ecore_file
22ecore_suite_deps += ecore_evas
23ecore_suite_deps += ecore_input
24ecore_suite_deps += ecore_imf
25
26if get_option('ecore_audio')
27 ecore_suite_deps += ecore_audio
28 ecore_suite_src += 'ecore_test_ecore_audio.c'
29endif
30
31if get_option('ecore_fb')
32 ecore_suite_deps += ecore_fb
33 ecore_suite_src += 'ecore_test_ecore_fb.c'
34endif
35
36if get_option('ecore_drm2')
37 ecore_suite_deps += ecore_drm2
38endif
39
40if get_option('ecore_x')
41 ecore_suite_src += 'ecore_test_ecore_x.c'
42 ecore_suite_deps += ecore_x
43endif
44
19ecore_suite = executable('ecore_suite', 45ecore_suite = executable('ecore_suite',
20 ecore_suite_src, 46 ecore_suite_src,
21 dependencies: [ecore, ecore_imf, ecore_evas, ecore_input, ecore_file, check], 47 dependencies: [ecore_suite_deps, check],
22 c_args : [ 48 c_args : [
23 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', 49 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
24 '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] 50 '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']