summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 16:18:08 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 17:17:13 +0000
commitc9dca7ce5deb86fd9252dc5d7f2301636f55a4e3 (patch)
tree17cf049784faef646e3bb085cf3990f70542b4d1
parenta0d47d637038faf070ba564aa1b59ab9765e9288 (diff)
meson - re-enable emotion_test binaries and data like autofoo
-rw-r--r--src/tests/emotion/data/meson.build7
-rw-r--r--src/tests/emotion/meson.build10
2 files changed, 11 insertions, 6 deletions
diff --git a/src/tests/emotion/data/meson.build b/src/tests/emotion/data/meson.build
index 7402b3a19b..5ab6690653 100644
--- a/src/tests/emotion/data/meson.build
+++ b/src/tests/emotion/data/meson.build
@@ -5,7 +5,7 @@ edc_files = [
5themes = [] 5themes = []
6 6
7foreach edc_file : edc_files 7foreach edc_file : edc_files
8 themes += custom_target('edje_cc_' + edc_file, 8 themes += custom_target('edje_cc_' + edc_file,
9 input : edc_file, 9 input : edc_file,
10 output : '@BASENAME@.edj', 10 output : '@BASENAME@.edj',
11 command : edje_cc_exe + [ '-beta', 11 command : edje_cc_exe + [ '-beta',
@@ -17,5 +17,8 @@ foreach edc_file : edc_files
17 '-md', meson.current_source_dir(), 17 '-md', meson.current_source_dir(),
18 '-td', meson.current_source_dir(), 18 '-td', meson.current_source_dir(),
19 '@INPUT@', '@OUTPUT@'], 19 '@INPUT@', '@OUTPUT@'],
20 depends : edje_cc) 20 depends : edje_cc,
21 install : true,
22 install_dir : join_paths(dir_data, 'emotion', 'data')
23 )
21endforeach 24endforeach
diff --git a/src/tests/emotion/meson.build b/src/tests/emotion/meson.build
index ec5027c07b..9e9154b1b5 100644
--- a/src/tests/emotion/meson.build
+++ b/src/tests/emotion/meson.build
@@ -1,19 +1,21 @@
1subdir('data') 1subdir('data')
2 2
3emotion_eo_suite = executable('emotion_eo_suite', 3emotion_test_eo = executable('emotion_test-eo',
4 'emotion_test_main-eo.c', themes, 4 'emotion_test_main-eo.c', themes,
5 dependencies: [check, eo, evas, emotion, ecore_evas, edje, ecore], 5 dependencies: [eo, evas, emotion, ecore_evas, edje, ecore],
6 include_directories : config_dir, 6 include_directories : config_dir,
7 install: true,
7 c_args : [ 8 c_args : [
8 '-DPACKAGE_DATA_DIR="'+meson.current_build_dir()+'"', 9 '-DPACKAGE_DATA_DIR="'+meson.current_build_dir()+'"',
9 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', 10 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
10 '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] 11 '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
11) 12)
12 13
13emotion_suite = executable('emotion_suite', 14emotion_test = executable('emotion_test',
14 'emotion_test_main.c', themes, 15 'emotion_test_main.c', themes,
15 dependencies: [check, eo, evas, emotion, ecore_evas, edje, ecore], 16 dependencies: [eo, evas, emotion, ecore_evas, edje, ecore],
16 include_directories : config_dir, 17 include_directories : config_dir,
18 install: true,
17 c_args : [ 19 c_args : [
18 '-DPACKAGE_DATA_DIR="'+meson.current_build_dir()+'"', 20 '-DPACKAGE_DATA_DIR="'+meson.current_build_dir()+'"',
19 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', 21 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',