diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-12-27 16:18:08 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-12-27 17:17:13 +0000 |
| commit | c9dca7ce5deb86fd9252dc5d7f2301636f55a4e3 (patch) | |
| tree | 17cf049784faef646e3bb085cf3990f70542b4d1 | |
| parent | a0d47d637038faf070ba564aa1b59ab9765e9288 (diff) | |
| download | efl-c9dca7ce5deb86fd9252dc5d7f2301636f55a4e3.tar.gz | |
meson - re-enable emotion_test binaries and data like autofoo
| -rw-r--r-- | src/tests/emotion/data/meson.build | 7 | ||||
| -rw-r--r-- | src/tests/emotion/meson.build | 10 |
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 = [ themes = [] foreach edc_file : edc_files - themes += custom_target('edje_cc_' + edc_file, + themes += custom_target('edje_cc_' + edc_file, input : edc_file, output : '@BASENAME@.edj', command : edje_cc_exe + [ '-beta', @@ -17,5 +17,8 @@ foreach edc_file : edc_files '-md', meson.current_source_dir(), '-td', meson.current_source_dir(), '@INPUT@', '@OUTPUT@'], - depends : edje_cc) + depends : edje_cc, + install : true, + install_dir : join_paths(dir_data, 'emotion', 'data') + ) endforeach 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 @@ subdir('data') -emotion_eo_suite = executable('emotion_eo_suite', +emotion_test_eo = executable('emotion_test-eo', 'emotion_test_main-eo.c', themes, - dependencies: [check, eo, evas, emotion, ecore_evas, edje, ecore], + dependencies: [eo, evas, emotion, ecore_evas, edje, ecore], include_directories : config_dir, + install: true, c_args : [ '-DPACKAGE_DATA_DIR="'+meson.current_build_dir()+'"', '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] ) -emotion_suite = executable('emotion_suite', +emotion_test = executable('emotion_test', 'emotion_test_main.c', themes, - dependencies: [check, eo, evas, emotion, ecore_evas, edje, ecore], + dependencies: [eo, evas, emotion, ecore_evas, edje, ecore], include_directories : config_dir, + install: true, c_args : [ '-DPACKAGE_DATA_DIR="'+meson.current_build_dir()+'"', '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', |