From cd50247544b5b348a4fab884bac004c2bfa11339 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 19 May 2020 16:30:08 +0200 Subject: [PATCH] lib: add more c_args handling for places we missed before MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit These meson files did not have the c_args handling before. Make sure we use package_c_args here as well. Reviewed-by: Vincent Torri Reviewed-by: João Paulo Taylor Ienczak Zanette Differential Revision: https://phab.enlightenment.org/D11860 --- src/lib/ecore_avahi/meson.build | 1 + src/lib/ecore_buffer/meson.build | 1 + src/lib/ecore_cocoa/meson.build | 1 + src/lib/ecore_drm2/meson.build | 1 + src/lib/ecore_fb/meson.build | 1 + src/lib/ecore_wl2/meson.build | 1 + src/lib/ecore_x/meson.build | 1 + src/lib/elput/meson.build | 1 + 8 files changed, 8 insertions(+) diff --git a/src/lib/ecore_avahi/meson.build b/src/lib/ecore_avahi/meson.build index 40e0378..6a14a4e 100644 --- a/src/lib/ecore_avahi/meson.build +++ b/src/lib/ecore_avahi/meson.build @@ -9,6 +9,7 @@ config_h.set('HAVE_AVAHI', '1') ecore_avahi_lib = library('ecore_avahi', ecore_avahi_src, + c_args : package_c_args, dependencies: [m] + ecore_avahi_deps + ecore_avahi_pub_deps, include_directories : config_dir + [include_directories(join_paths('..','..'))], install: true, diff --git a/src/lib/ecore_buffer/meson.build b/src/lib/ecore_buffer/meson.build index 4cf3fc6..c4aa63f 100644 --- a/src/lib/ecore_buffer/meson.build +++ b/src/lib/ecore_buffer/meson.build @@ -19,6 +19,7 @@ ecore_buffer_src = [ ecore_buffer_lib = library('ecore_buffer', ecore_buffer_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_buffer_pub_deps + ecore_buffer_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_cocoa/meson.build b/src/lib/ecore_cocoa/meson.build index 7b7bdcf..e04ca0f 100644 --- a/src/lib/ecore_cocoa/meson.build +++ b/src/lib/ecore_cocoa/meson.build @@ -27,6 +27,7 @@ evas_include_directories = [ ecore_cocoa_lib = library('ecore_cocoa', ecore_cocoa_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_cocoa_deps + ecore_cocoa_pub_deps, include_directories : config_dir + evas_include_directories, link_args : ['-lobjc', '-framework', 'CoreFoundation', '-framework', 'cocoa', '-Wl,-U,_evas_textblock_text_markup_to_utf8'], diff --git a/src/lib/ecore_drm2/meson.build b/src/lib/ecore_drm2/meson.build index 1a36fbb..53ddc30 100644 --- a/src/lib/ecore_drm2/meson.build +++ b/src/lib/ecore_drm2/meson.build @@ -16,6 +16,7 @@ ecore_drm2_src = [ ecore_drm2_lib = library('ecore_drm2', ecore_drm2_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_drm2_pub_deps + ecore_drm2_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_fb/meson.build b/src/lib/ecore_fb/meson.build index a2eb540..28ad6bf 100644 --- a/src/lib/ecore_fb/meson.build +++ b/src/lib/ecore_fb/meson.build @@ -20,6 +20,7 @@ ecore_fb_src = [ ecore_fb_lib = library('ecore_fb', ecore_fb_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_fb_pub_deps + ecore_fb_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_wl2/meson.build b/src/lib/ecore_wl2/meson.build index 03de789..48788ca 100644 --- a/src/lib/ecore_wl2/meson.build +++ b/src/lib/ecore_wl2/meson.build @@ -40,6 +40,7 @@ ecore_wl2_src += [ ecore_wl2_lib = library('ecore_wl2', ecore_wl2_src, pub_eo_file_target, wayland_protocol_header, + c_args : package_c_args, dependencies: ecore_wl2_deps + ecore_wl2_pub_deps, include_directories : config_dir, install: true, diff --git a/src/lib/ecore_x/meson.build b/src/lib/ecore_x/meson.build index ba7d01f..51bdb2a 100644 --- a/src/lib/ecore_x/meson.build +++ b/src/lib/ecore_x/meson.build @@ -129,6 +129,7 @@ ecore_x_deps += lib ecore_x_lib = library('ecore_x', ecore_x_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_x_pub_deps + ecore_x_deps, include_directories : config_dir, install: true, diff --git a/src/lib/elput/meson.build b/src/lib/elput/meson.build index 8fde7b5..bbfe85d 100644 --- a/src/lib/elput/meson.build +++ b/src/lib/elput/meson.build @@ -21,6 +21,7 @@ elput_deps += dependency('libudev') elput_lib = library('elput', elput_src, pub_eo_file_target, + c_args : package_c_args, dependencies: elput_pub_deps + elput_deps, include_directories : config_dir, install: true, -- 2.7.4