From dbf9aea5fb0fa124699d590e347018edabf4b5a1 Mon Sep 17 00:00:00 2001 From: Jongmin Lee Date: Mon, 7 Oct 2019 06:32:13 +0900 Subject: [PATCH] build - remove evas-modules option @tizen_fix Change-Id: I534de0cb67f6add0159c4ffee1049d44f5f7f8ff --- src/modules/evas/engines/gl_tbm/meson.build | 24 +++++++++++------------ src/modules/evas/engines/software_tbm/meson.build | 22 ++++++++++----------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/modules/evas/engines/gl_tbm/meson.build b/src/modules/evas/engines/gl_tbm/meson.build index d0d6fe6..f0cfcd4 100644 --- a/src/modules/evas/engines/gl_tbm/meson.build +++ b/src/modules/evas/engines/gl_tbm/meson.build @@ -11,18 +11,16 @@ engine_header = [ engine_deps = [gl_deps, libtbm] engine_include_dir = include_directories(join_paths('..','software_generic')) -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src + engine_header, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - - install_headers(engine_header, - install_dir: dir_package_include +shared_module(mod_full_name, engine_src + engine_header, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +install_headers(engine_header, +install_dir: dir_package_include +) + +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) diff --git a/src/modules/evas/engines/software_tbm/meson.build b/src/modules/evas/engines/software_tbm/meson.build index 706452d..d5cfcbc 100644 --- a/src/modules/evas/engines/software_tbm/meson.build +++ b/src/modules/evas/engines/software_tbm/meson.build @@ -11,16 +11,14 @@ engine_header = [ engine_deps = []#ecore_drm2, libdrm, gl_deps, dependency('gbm')] engine_include_dir = include_directories(join_paths('..','software_generic')) -if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src + engine_header, - include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas] + engine_deps, - install : true, - install_dir : mod_install_dir, - name_suffix : sys_mod_extension - ) - install_headers(engine_header, - install_dir: dir_package_include +shared_module(mod_full_name, engine_src + engine_header, + include_directories : config_dir + [engine_include_dir], + dependencies : [eina, evas] + engine_deps, + install : true, + install_dir : mod_install_dir, + name_suffix : sys_mod_extension ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -endif +install_headers(engine_header, +install_dir: dir_package_include +) +module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) -- 2.7.4