bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=6711ebac4208e80d58501ff818e851721220d0ea
commit 6711ebac4208e80d58501ff818e851721220d0ea Author: Marcel Hollerbach <[email protected]> Date: Fri Dec 29 11:21:30 2017 +0000 meson: time for elput! --- meson.build | 1 + meson_options.txt | 6 ++++++ src/lib/elput/meson.build | 41 +++++++++++++++++++++++++++++++++++++++++ src/tests/elput/meson.build | 17 +++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/meson.build b/meson.build index 44dcb1689d..f81311be3d 100644 --- a/meson.build +++ b/meson.build @@ -107,6 +107,7 @@ subprojects = [ ['ecore_ipc' , false, true, false, false, false, false, []], ['ecore_buffer' , true, true, true, false, false, false, []], ['ector' , false, true, false, false, true, false, ['draw', 'triangulator', 'freetype']], +['elput' , false, true, false, false, true, false, []], ] diff --git a/meson_options.txt b/meson_options.txt index 518b7bbeda..1f1c502530 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -118,6 +118,12 @@ option('ector', description : 'build ector' ) +option('elput', + type : 'boolean', + value : true, + description : 'build elput' +) + option('build-id', type : 'string', value : 'none', diff --git a/src/lib/elput/meson.build b/src/lib/elput/meson.build new file mode 100644 index 0000000000..541a94e5aa --- /dev/null +++ b/src/lib/elput/meson.build @@ -0,0 +1,41 @@ +elput_deps = [ecore, ecore_input, eldbus, eeze, eo, m, eina] +pub_eo_file_target = [] + +elput_header_src = [ + 'Elput.h' +] + +elput_src = [ + 'elput_touch.c', + 'elput_evdev.c', + 'elput_input.c', + 'elput_logind.c', + 'elput_manager.c', + 'elput.c', + 'elput_private.h' +] + +elput_deps += dependency('libinput', version : ['>=1.7.0']) +elput_deps += dependency('xkbcommon', version : ['>=0.3.0']) +elput_deps += dependency('libudev') +if get_option('systemd') + elput_deps += systemd +endif + +elput_lib = library('elput', + elput_src, pub_eo_file_target, + dependencies: [ elput_deps], + include_directories : config_dir, + install: true, +) + +elput = declare_dependency( + include_directories: [include_directories('.')], + link_with: elput_lib, + sources : pub_eo_file_target, + dependencies: [eina, eldbus], +) + +install_headers(elput_header_src, + install_dir : dir_package_include, +) \ No newline at end of file diff --git a/src/tests/elput/meson.build b/src/tests/elput/meson.build new file mode 100644 index 0000000000..23ec7b21e0 --- /dev/null +++ b/src/tests/elput/meson.build @@ -0,0 +1,17 @@ +elput_suite_src = [ + 'elput_suite.c', + 'elput_suite.h', + 'elput_test_elput.c' +] + +elput_suite = executable('elput_suite', + elput_suite_src, + dependencies: [elput, ecore, check], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('elput-suite', elput_suite, + is_parallel: true, +) \ No newline at end of file --
