This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit ee2d0dd8fa9d486272f54de65b16d9645abe3d71
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 21 11:21:18 2024 +0500
meson: add postfix '_dep' to external dependencies and activate wrapped meson options
---
meson/deps/meson.build | 21 ++++--
meson/options/meson.build | 19 ++---
meson_options.txt | 4 +-
po/meson.build | 2 +-
services/dbus/meson.build | 6 +-
services/systemd/meson.build | 7 +-
src/bindings/mono/efl_mono/meson.build | 2 +-
src/examples/ecore/meson.build | 5 +-
src/examples/edje/meson.build | 2 +-
src/generic/evas/gst/meson.build | 2 +-
src/generic/evas/meson.build | 2 +-
src/lib/ecore/meson.build | 10 +--
src/lib/ecore_audio/meson.build | 8 +--
src/lib/ecore_con/meson.build | 2 +-
src/lib/ecore_fb/meson.build | 4 +-
src/lib/ecore_input/meson.build | 2 +-
src/lib/ecore_x/meson.build | 33 +++------
src/lib/ector/gl/meson.build | 2 +-
src/lib/ector/meson.build | 2 +-
src/lib/ector/software/meson.build | 2 +-
src/lib/edje/meson.build | 6 +-
src/lib/eeze/meson.build | 22 +++---
src/lib/efl/interfaces/meson.build | 2 +-
src/lib/efl_canvas_wl/meson.build | 4 +-
src/lib/eina/meson.build | 81 +++++++++++-----------
src/lib/eio/meson.build | 2 +-
src/lib/eldbus/meson.build | 2 +-
src/lib/elementary/meson.build | 24 +++----
src/lib/emotion/meson.build | 4 +-
src/lib/eo/meson.build | 8 +--
src/lib/evas/meson.build | 81 +++++++++-------------
src/modules/ecore/system/systemd/meson.build | 2 +-
src/modules/ecore_evas/engines/cocoa/meson.build | 2 +-
src/modules/ecore_evas/engines/drm/meson.build | 2 +-
src/modules/ecore_evas/engines/wayland/meson.build | 2 +-
src/modules/ecore_evas/engines/x/meson.build | 2 +-
src/modules/ecore_evas/meson.build | 20 +++---
src/modules/ecore_imf/meson.build | 12 ++--
src/modules/emotion/meson.build | 2 +-
src/modules/evas/engines/meson.build | 6 +-
src/modules/evas/engines/software_x11/meson.build | 2 +-
src/static_libs/libunibreak/meson.build | 8 +--
src/static_libs/lz4/meson.build | 2 +-
src/tests/ecore/meson.build | 8 +--
src/tests/ecore_wl2/meson.build | 2 +-
src/tests/eo/suite/meson.build | 22 +++---
46 files changed, 214 insertions(+), 253 deletions(-)
diff --git a/meson/deps/meson.build b/meson/deps/meson.build
index c501132541..894f3d97f5 100644
--- a/meson/deps/meson.build
+++ b/meson/deps/meson.build
@@ -3,7 +3,7 @@ null_dep = dependency('', required: false)
## Common dependencies
thread_dep = dependency('threads')
dbus_dep = dependency('dbus-1')
-unwind = dependency('libunwind-generic', required: false)
+unwind_dep = dependency('libunwind-generic', required: false)
poppler_dep = dependency('poppler-cpp')
spectre_dep = dependency('libspectre')
raw_dep = dependency('libraw')
@@ -12,12 +12,13 @@ zlib_dep = dependency('zlib')
glib2_dep = dependency('glib-2.0')
gthread_dep = dependency('gthread-2.0')
sndfile_dep = dependency('sndfile')
-pulse_dep = dependency('libpulse')
+if WITH_PULSEAUDIO
+ pulse_dep = dependency('libpulse')
+endif
xkb_dep = dependency('xkbcommon')
input_dep = dependency('libinput', version : '>= 1.7.0')
udev_dep = dependency('libudev')
freetype2_dep = dependency('freetype2')
-glesv2_dep = dependency('glesv2')
png_dep = dependency('libpng')
tiff_dep = dependency('libtiff-4', required: not get_option('evas-loaders-disabler').contains('tiff'))
webp_dep = dependency('libwebp', required: not get_option('evas-loaders-disabler').contains('webp'), version: '>=0.5.0')
@@ -29,7 +30,7 @@ jxl_dep = dependency('libjxl', required: not get_option('evas-loade
jxl_threads_dep = dependency('libjxl_threads', required: not get_option('evas-loaders-disabler').contains('jxl'), version: '>= 0.6.2')
json_dep = dependency('rlottie', required: not get_option('evas-loaders-disabler').contains('json'))
jpeg_dep = dependency('libjpeg', required: false)
-iconv = dependency('iconv', required: false)
+iconv_dep = dependency('iconv', required: false)
x11_dep = dependency('x11', required: false)
xcb_dep = dependency('xcb', required: false)
x11_xcb_dep = dependency('x11-xcb', required: false)
@@ -131,10 +132,16 @@ endif
if get_option('opengl') == 'es-egl'
egl_dep = dependency('egl')
- gl_dep = dependency('gl')
+ glesv2_dep = dependency('glesv2')
gbm_dep = dependency('gbm') # lib/modules/evas/engines/gl_drm
endif
+if get_option('opengl') != 'none'
+ if get_option('opengl') != 'es-egl'
+ gl_dep = dependency('gl')
+ endif
+endif
+
## ECORE_FB
if WITH_TSLIB
tslib_dep = dependency('tslib')
@@ -199,7 +206,7 @@ if not WITH_EMBEDDED_LZ4
lz4 = lz4_dep
endif
-if not WITH_EMBEDDED_UNIBRAKE
+if not WITH_EMBEDDED_UNIBREAK
libunibreak_dep = dependency('libunibreak', version : '>=4.2')
libunibreak = libunibreak_dep
endif
@@ -228,7 +235,7 @@ if jpeg_dep.found()
jpeg_dep = cc.find_library('jpeg')
endif
-if not iconv.found()
+if not iconv_dep.found()
iconv = cc.find_library('iconv', required: false)
endif
diff --git a/meson/options/meson.build b/meson/options/meson.build
index f7607f162d..e998dfc078 100644
--- a/meson/options/meson.build
+++ b/meson/options/meson.build
@@ -35,18 +35,21 @@ MAX_FD_SIZE = get_option('max-fd-size')
WITH_EFL_ONE = get_option('efl-one')
WITH_EMBEDDED_DRM = get_option('embedded-libdrm')
WITH_EMBEDDED_LZ4 = get_option('embedded-lz4')
-WITH_EMBEDDED_UNIBRAKE = get_option('embedded-libunibreak')
+WITH_EMBEDDED_UNIBREAK = get_option('embedded-libunibreak')
+INSTALL_EO_FILES = get_option('install-eo-files')
+WITH_EEZE = get_option('eeze')
+WITH_GLIB = get_option('glib')
+WITH_GLIB_MAINLOOP = get_option('glib-mainloop')
+DEBUG_EINA_MAGIC = get_option('debug-eina-magic')
+DEBUG_THREADS = get_option('debug-threads')
+OPENGL = get_option('opengl')
+
+# WITH_JSON = get_option('evas-loaders-disabler').contains('json')
-# option('eeze')
-# option('debug-eina-magic')
-# option('debug-threads')
-# option('glib')
-# option('glib-mainloop')
-# option('install-eo-files')
# option('efl-one')
# option('native-arch-optimization')
# option('bindings')
-# option('opengl')
+
# option('network-backend')
# option('evas-loaders-disabler')
# option('ecore-imf-loaders-disabler')
diff --git a/meson_options.txt b/meson_options.txt
index 7946d6ba34..c42b6d7b6f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,12 +28,12 @@ option('hyphen', type: 'boolean', value: false, descript
option('wl-deprecated', type: 'boolean', value: false, description: 'Enable: deprecated Wayland')
option('drm-deprecated', type: 'boolean', value: false, description: 'Enable: deprecated DRM/KMS')
option('eeze', type: 'boolean', value: true, description: 'Enable: device abstraction (udev wrapper)')
-option('eina-magic-debug', type: 'boolean', value: true, description: 'Enable: magic number checking of eina structures')
+option('debug-eina-magic', type: 'boolean', value: true, description: 'Enable: magic number checking of eina structures')
option('debug-threads', type: 'boolean', value: false, description: 'Enable: thread debugging')
option('build-examples', type: 'boolean', value: false, description: 'Enable: examples')
option('build-tests', type: 'boolean', value: true, description: 'Enable: tests')
option('glib', type: 'boolean', value: false, description: 'Enable: main loop integration for glib')
-option('g-mainloop', type: 'boolean', value: false, description: 'Enable: use glib to run the main loop')
+option('glib-mainloop', type: 'boolean', value: false, description: 'Enable: use glib to run the main loop')
option('embedded-lz4', type: 'boolean', value: true, description: 'Enable: embedded in-tree zlib r131 release instead of system zlib')
option('embedded-libunibreak', type: 'boolean', value: true, description: 'Enable: embedded in-tree libunibreak instead of the system libunibreak.')
option('embedded-libdrm', type: 'boolean', value: false, description: 'Enable: embedded in-tree libdrm instead of the system libdrm. Get Exynos-Drm support')
diff --git a/po/meson.build b/po/meson.build
index a35c0768ea..c4bd6dd66c 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,4 +1,4 @@
-if get_option('nls')
+if WITH_LOCALIZATION
i18n = import('i18n')
i18n.gettext('efl',
args: [
diff --git a/services/dbus/meson.build b/services/dbus/meson.build
index 0ecd4608bf..c83dff47d7 100644
--- a/services/dbus/meson.build
+++ b/services/dbus/meson.build
@@ -1,11 +1,9 @@
-dep = dependency('dbus-1')
-
org_enlightenment_ethumb_service_config = configuration_data()
org_enlightenment_ethumb_service_config.set('prefix', dir_prefix)
systemd_dbus_prefix = '# '
-if get_option('systemd')
+if WITH_SYSTEMD
systemd_dbus_prefix = ''
endif
org_enlightenment_ethumb_service_config.set('systemd_dbus_prefix',
@@ -15,4 +13,4 @@ configure_file(
input: 'org.enlightenment.Ethumb.service.in',
output: 'org.enlightenment.Ethumb.service',
configuration: org_enlightenment_ethumb_service_config,
- install_dir: dep.get_pkgconfig_variable('session_bus_services_dir'))
+ install_dir: dbus_dep.get_pkgconfig_variable('session_bus_services_dir'))
diff --git a/services/systemd/meson.build b/services/systemd/meson.build
index a2d54682d2..4d0dd0447f 100644
--- a/services/systemd/meson.build
+++ b/services/systemd/meson.build
@@ -1,7 +1,6 @@
-if get_option('systemd')
- sys_dep = dependency('systemd', required: false)
- if sys_dep.found()
- sys_dir = sys_dep.get_pkgconfig_variable('systemduserunitdir')
+if WITH_SYSTEMD
+ if systemd_dep.found()
+ sys_dir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
else
sys_dir = dir_lib / 'systemd/user'
endif
diff --git a/src/bindings/mono/efl_mono/meson.build b/src/bindings/mono/efl_mono/meson.build
index b38574a803..dc8369c912 100644
--- a/src/bindings/mono/efl_mono/meson.build
+++ b/src/bindings/mono/efl_mono/meson.build
@@ -49,7 +49,7 @@ efl_src = configure_file(
friend_assemblies = ''
mono_friend_assemblies = get_option('mono-friend-assemblies')
-if get_option('build-tests')
+if WITH_TESTS
if get_option('dotnet')
mono_friend_assemblies += 'efl_sharp_test_suite'
else
diff --git a/src/examples/ecore/meson.build b/src/examples/ecore/meson.build
index 5f2ca12b8e..7ab3331dd9 100644
--- a/src/examples/ecore/meson.build
+++ b/src/examples/ecore/meson.build
@@ -22,13 +22,12 @@ foreach example : examples
executable(example, example + '.c', dependencies: [eina, ecore, ecore_file])
endforeach
-if get_option('gstreamer')
+if WITH_GSTREAMER
examples = [
'ecore_pipe_gstreamer_example',
]
- gstreamer = dependency('gstreamer-1.0')
foreach example : examples
- executable(example, example + '.c', dependencies: [eina, ecore, gstreamer, ecore_file])
+ executable(example, example + '.c', dependencies: [eina, ecore, gstreamer_dep, ecore_file])
endforeach
endif
diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index dd7fe33433..e7b4733008 100644
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -47,7 +47,7 @@ edc_files = [
'center_zoom.edc',
]
-if get_option('physics')
+if WITH_PHYSICS
edc_files += [
'physics_3d.edc',
'physics_actions.edc',
diff --git a/src/generic/evas/gst/meson.build b/src/generic/evas/gst/meson.build
index 257f973eed..cd8cf62d63 100644
--- a/src/generic/evas/gst/meson.build
+++ b/src/generic/evas/gst/meson.build
@@ -3,7 +3,7 @@ generic_src = files(
)
generic_deps = []
-if get_option('gstreamer')
+if WITH_GSTREAMER
generic_deps += dependency('gstreamer-1.0')
endif
generic_support = ['264','3g2','3gp','3gp2','3gpp','3gpp2','3p2','asf','avi','bdm','bdmv','clpi','cpi','dv','fla','flv','m1v','m2t','m2v','m4v','mkv','mov','mp2','mp2ts','mp4','mpe','mpeg','mpg','mpl','mpls','mts','mxf','nut','nuv','ogg','ogm','ogv','qt','rm','rmj','rmm','rms','rmx','rmvb','rv','swf','ts','webm','weba','wmv']
diff --git a/src/generic/evas/meson.build b/src/generic/evas/meson.build
index a5a229805f..54f96f7b07 100644
--- a/src/generic/evas/meson.build
+++ b/src/generic/evas/meson.build
@@ -1,6 +1,6 @@
generic_loaders = [ 'pdf', 'ps', 'raw', 'rsvg', 'xcf' ]
-if get_option('gstreamer')
+if WITH_GSTREAMER
generic_loaders += [ 'gst' ]
endif
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index 5aa9cd96ed..1a05fef9de 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -182,16 +182,16 @@ else
ecore_src += files('ecore_signal.c', 'ecore_exe_posix.c')
endif
-if get_option('glib') and not WINDOWS
+if WITH_GLIB and not WINDOWS
ecore_ext_deps += dependency('glib-2.0')
ecore_ext_deps += dependency('gthread-2.0')
config_h.set('GLIB_INTEGRATION_ALWAYS', '1')
config_h.set('HAVE_GLIB', '1')
endif
-if get_option('g-mainloop')
- if not get_option('glib')
- error('g-mainloop enabled by glib not. Please enable with -Dglib=true')
+if WITH_GLIB_MAINLOOP
+ if not WITH_GLIB
+ error('glib-mainloop enabled by glib not. Please enable with -Dglib=true')
else
config_h.set('USE_G_MAIN_LOOP', '1')
endif
@@ -215,7 +215,7 @@ ecore = declare_dependency(
eolian_ecore_dir = eolian_include_dir / package_version_name
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files + pub_eo_types_files,
install_dir: eolian_ecore_dir
)
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index 842082a0d4..e3074260e6 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -58,11 +58,11 @@ ecore_audio_src += files(
'ecore_audio_sndfile_vio.c'
)
-ecore_audio_deps += dependency('sndfile')
+ecore_audio_deps += sndfile_dep
config_h.set('HAVE_SNDFILE', '1')
-if get_option('pulseaudio')
- ecore_audio_ext_deps += dependency('libpulse')
+if WITH_PULSEAUDIO
+ ecore_audio_ext_deps += pulse_dep
ecore_audio_src += files(
'ecore_audio_pulse_ml.c',
@@ -98,7 +98,7 @@ ecore_audio = declare_dependency(
#
# Only enable that again when the namespace problems are fixed. ref T8648
#
-#if get_option('install-eo-files')
+#if INSTALL_EO_FILES
# install_data(pub_eo_files + pub_eo_types_files,
# install_dir: eolian_ecore_dir
# )
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index f3dbd16b68..3b18b64136 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -201,7 +201,7 @@ ecore_con = declare_dependency(
dependencies: ecore_con_pub_deps,
)
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files + pub_eo_types_files,
install_dir: eolian_ecore_dir
)
diff --git a/src/lib/ecore_fb/meson.build b/src/lib/ecore_fb/meson.build
index 97d4249fa9..d5c9f143b7 100644
--- a/src/lib/ecore_fb/meson.build
+++ b/src/lib/ecore_fb/meson.build
@@ -2,8 +2,8 @@ ecore_fb_deps = [ecore, ecore_input]
ecore_fb_pub_deps = [eina]
ecore_fb_ext_deps = []
-if get_option('tslib')
- ecore_fb_ext_deps += dependency('tslib')
+if WITH_TSLIB
+ ecore_fb_ext_deps += tslib_dep
endif
ecore_fb_header_src = [
diff --git a/src/lib/ecore_input/meson.build b/src/lib/ecore_input/meson.build
index d12a7228c1..8c2aa6cfdb 100644
--- a/src/lib/ecore_input/meson.build
+++ b/src/lib/ecore_input/meson.build
@@ -14,7 +14,7 @@ ecore_input_src = files(
'ecore_input_private.h'
)
-if get_option('eeze')
+if WITH_EEZE
ecore_input_deps += eeze
endif
diff --git a/src/lib/ecore_x/meson.build b/src/lib/ecore_x/meson.build
index ec8e28ae4c..f948fe65ca 100644
--- a/src/lib/ecore_x/meson.build
+++ b/src/lib/ecore_x/meson.build
@@ -59,33 +59,18 @@ ecore_x_checks = [
['Xss', 'scrnsaver.h', 'Xss', 'XScreenSaverSelectInput'],
]
-if get_option('xpresent')
+if WITH_XPRESENT
ecore_x_checks += [['Xpresent', 'Xpresent.h', 'Xpresent', 'XPresentQueryExtension']]
endif
-if get_option('xinput2')
+if WITH_XINPUT2
ecore_x_checks += [['Xi2', 'XInput2.h', 'Xi', 'XIQueryDevice']]
endif
-if get_option('xinput22')
+if WITH_XINPUT22
ecore_x_checks += [['Xi2_2', 'XInput2.h', 'Xi','XIGrabTouchBegin']]
endif
-x11 = dependency('x11', required: false)
-if not x11.found()
- x11 = cc.find_library('X11', required: true)
-endif
-
-xcb = dependency('xcb', required: false)
-if not xcb.found()
- xcb = cc.find_library('xcb', required: true)
-endif
-
-x11_xcb = dependency('x11-xcb', required: false)
-if not x11_xcb.found()
- x11_xcb = cc.find_library('X11-xcb', required: true)
-endif
-
foreach ecore_x_check : ecore_x_checks
x_lib = cc.find_library(ecore_x_check[2],
required: false
@@ -100,7 +85,7 @@ int main () {
#endif
}
''',
- dependencies : [x_lib, x11]
+ dependencies : [x_lib, x11_dep]
)
config_h.set('ECORE_'+ecore_x_check[0].to_upper(), '1')
else
@@ -109,14 +94,14 @@ int main () {
ecore_x_ext_deps += x_lib
endforeach
-ecore_x_ext_deps += x11
-ecore_x_ext_deps += xcb
-ecore_x_ext_deps += x11_xcb
+ecore_x_ext_deps += x11_dep
+ecore_x_ext_deps += xcb_dep
+ecore_x_ext_deps += x11_xcb_dep
# there are a few special cases
cc.has_header_symbol('X11/XKBlib.h', 'XkbSetDetectableAutoRepeat',
- dependencies : [x11, xcb]
+ dependencies : [x11_dep, xcb_dep]
)
config_h.set('ECORE_XKB', '1')
@@ -124,7 +109,7 @@ lib = cc.find_library('Xcursor',
required: true
)
cc.has_header_symbol('X11/Xcursor/Xcursor.h', 'XcursorSupportsARGB',
- dependencies : [x11, xcb]
+ dependencies : [x11_dep, xcb_dep]
)
config_h.set('ECORE_XCURSOR', '1')
ecore_x_ext_deps += lib
diff --git a/src/lib/ector/gl/meson.build b/src/lib/ector/gl/meson.build
index f0969a5733..54f524a147 100644
--- a/src/lib/ector/gl/meson.build
+++ b/src/lib/ector/gl/meson.build
@@ -38,7 +38,7 @@ endforeach
#
# Only enable that again when the namespace problems are fixed. ref T8648
#
-#if get_option('install-eo-files')
+#if INSTALL_EO_FILES
# install_data(pub_eo_files,
# install_dir: eolian_include_dir / package_version_name
# )
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index af498fe838..eb98812448 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -61,7 +61,7 @@ pub_eo_types_files = [
#
# Only enable that again when the namespace problems are fixed. ref T8648
#
-#if get_option('install-eo-files')
+#if INSTALL_EO_FILES
# install_data(ector_pub_eo_files + pub_eo_types_files,
# install_dir: eolian_include_dir / package_version_name
# )
diff --git a/src/lib/ector/software/meson.build b/src/lib/ector/software/meson.build
index a1f6a40545..57f02e0b3e 100644
--- a/src/lib/ector/software/meson.build
+++ b/src/lib/ector/software/meson.build
@@ -49,7 +49,7 @@ endif
#
# Only enable that again when the namespace problems are fixed. ref T8648
#
-#if get_option('install-eo-files')
+#if INSTALL_EO_FILES
# install_data(pub_eo_files,
# install_dir: eolian_include_dir / package_version_name
# )
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index 1a24cbb3f6..7cb37f2f56 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -10,14 +10,14 @@ edje_deps = [
edje_pub_deps = [evas, eo, efl]
edje_ext_deps = [m, lua_dep, buildsystem_simple]
-if get_option('physics')
+if WITH_PHYSICS
edje_deps += ephysics
edje_pub_deps += ephysics
endif
config_h.set('EDJE_CALC_CACHE', '1')
-if get_option('audio')
+if WITH_AUDIO
config_h.set('ENABLE_MULTISENSE', '1')
edje_deps += ecore_audio
endif
@@ -162,7 +162,7 @@ edje = declare_dependency(
)
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files + pub_eo_types_files,
install_dir: eolian_include_dir / package_version_name
)
diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build
index f9ff062d9a..f62acdac22 100644
--- a/src/lib/eeze/meson.build
+++ b/src/lib/eeze/meson.build
@@ -8,7 +8,7 @@ eeze_header_src = [
'Eeze_Net.h',
'Eeze_Sensor.h',
'Eeze_Disk.h',
- '../../bin/eeze/eeze_scanner/eeze_scanner.h'
+ '../../bin/eeze/eeze_scanner/eeze_scanner.h',
]
eeze_src = files(
@@ -29,21 +29,20 @@ eeze_src = files(
'eeze_disk_private.h'
)
-if get_option('v4l2')
+if WITH_V4L2
config_h.set('HAVE_V4L2', '1')
if not cc.has_header('linux/videodev2.h')
error('v4l2 headers not found')
endif
endif
-if get_option('libmount')
- libmount = dependency('mount')
- eeze_ext_deps += libmount
- if libmount.version() == '2.19'
+if WITH_MOUNT
+ eeze_ext_deps += mount_dep
+ if mount_dep.version() == '2.19'
eeze_src += files('eeze_disk_libmount.c')
- elif libmount.version() < '2.19'
+ elif mount_dep.version() < '2.19'
eeze_src += files('eeze_disk_libmount_old.c')
- elif libmount.version() > '2.19'
+ elif mount_dep.version() > '2.19'
eeze_src += files('eeze_disk_libmount_new.c')
endif
config_h.set('HAVE_EEZE_MOUNT', '1')
@@ -53,12 +52,9 @@ endif
options_to_check = ['eject', 'mount', 'unmount']
-udev = dependency('libudev',
- version: ['>=148']
-)
-eeze_ext_deps += udev
+eeze_ext_deps += udev_dep
-if udev.version() < '199'
+if udev_dep.version() < '199'
config_h.set('OLD_LIBUDEV', '1')
endif
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 9d92606775..5c85818381 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -132,7 +132,7 @@ foreach eo_file : pub_eo_types_files
'-ghd', '@INPUT@'])
endforeach
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files,
install_dir: eolian_include_dir / package_version_name
)
diff --git a/src/lib/efl_canvas_wl/meson.build b/src/lib/efl_canvas_wl/meson.build
index 6494a0c87b..02c5c60be1 100644
--- a/src/lib/efl_canvas_wl/meson.build
+++ b/src/lib/efl_canvas_wl/meson.build
@@ -2,7 +2,7 @@ efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, ei
efl_canvas_wl_pub_deps = [eo, efl, evas]
efl_canvas_wl_ext_deps = [dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0'), wayland_protocol]
-if get_option('x11')
+if WITH_X11
efl_canvas_wl_deps += [ecore_x]
efl_canvas_wl_ext_deps += [dependency('xkbcommon-x11')]
endif
@@ -55,7 +55,7 @@ install_headers(efl_canvas_wl_header_src,
)
eolian_efl_canvas_wl_dir = eolian_include_dir / package_version_name
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files,
install_dir: eolian_efl_canvas_wl_dir
)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 54ccb7e21f..ea48668728 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -11,7 +11,7 @@ if SUN
eina_deps += [socket]
endif
-public_sub_headers = [
+public_sub_headers = files(
'eina_promise.h',
'eina_safety_checks.h',
'eina_error.h',
@@ -115,11 +115,11 @@ public_sub_headers = [
'eina_vpath.h',
'eina_abstract_content.h',
'eina_sha.h',
-]
+)
-public_headers = [
+public_headers = files(
'Eina.h'
-]
+)
eina_src = files(
'eina_abi.c',
@@ -210,29 +210,29 @@ endif
eina_config = configuration_data()
if get_option('buildtype') == 'debug'
- with_max_log_level=-1
- stringshare_usage=true
- use_valgrind=true
- debug_malloc=true
- debug_threads=true
- default_mempool=true
- want_cow_magic=true
+ with_max_log_level = -1
+ stringshare_usage = true
+ use_valgrind = true
+ debug_malloc = true
+ debug_threads = true
+ default_mempool = true
+ want_cow_magic = true
elif get_option('buildtype') == 'release'
- with_max_log_level=3
- stringshare_usage=false
- use_valgrind=false
- debug_malloc=false
- debug_threads=false
- default_mempool=false
- want_cow_magic=false
+ with_max_log_level = 3
+ stringshare_usage = false
+ use_valgrind = false
+ debug_malloc = false
+ debug_threads = false
+ default_mempool = false
+ want_cow_magic = false
else
- with_max_log_level=-1
- stringshare_usage=false
- use_valgrind=true
- debug_malloc=false
- debug_threads=false
- default_mempool=false
- want_cow_magic=false
+ with_max_log_level = -1
+ stringshare_usage = false
+ use_valgrind = true
+ debug_malloc = false
+ debug_threads = false
+ default_mempool = false
+ want_cow_magic = false
endif
if with_max_log_level != -1
@@ -244,13 +244,12 @@ if stringshare_usage
endif
if use_valgrind
- valgrind = dependency('valgrind', required: false)
- if not valgrind.found()
+ if not valgrind_dep.found()
config_h.set('NVALGRIND', 1)
else
config_h.set('HAVE_VALGRIND', 1)
endif
- eina_ext_deps += valgrind
+ eina_ext_deps += valgrind_dep
else
config_h.set('NVALGRIND', 1)
valgrind = []
@@ -264,7 +263,7 @@ if want_cow_magic
config_h.set('EINA_COW_MAGIC_ON', 1)
endif
-if get_option('eina-magic-debug')
+if DEBUG_EINA_MAGIC
eina_config.set('EINA_MAGIC_DEBUG', '1')
endif
@@ -272,7 +271,7 @@ if default_mempool
eina_config.set('EINA_DEFAULT_MEMPOOL', '1')
endif
-if get_option('systemd')
+if WITH_SYSTEMD
config_h.set('HAVE_SYSTEMD', '1')
endif
@@ -301,7 +300,7 @@ if cc.has_header_symbol(pthread_np_header_file, 'pthread_attr_setaffinity_np', a
eina_config.set('EINA_HAVE_PTHREAD_AFFINITY', '1')
endif
-if debug_threads and get_option('debug-threads')
+if debug_threads and DEBUG_THREADS
if cc.has_header_symbol('execinfo.h', 'backtrace')
eina_config.set('EINA_HAVE_DEBUG_THREADS', '1')
endif
@@ -352,27 +351,26 @@ eina_config_file = configure_file(
public_headers += eina_config_file
-unwind = dependency('libunwind-generic', required: false)
-if unwind.found()
+if unwind_dep.found()
config_h.set('HAVE_UNWIND', 1)
- eina_ext_deps += unwind
+ eina_ext_deps += unwind_dep
config_h.set('EINA_LOG_BACKTRACE_ENABLE', 1)
endif
#for the case that the iconv library is not part of libc but rather libiconv or smth. like that
-iconv = dependency('iconv', required: false)
-if not iconv.found()
- iconv = cc.find_library('iconv', required: false)
+if not iconv_dep.found()
+ iconv_dep = cc.find_library('iconv', required: false)
endif
-eina_ext_deps += [iconv]
+eina_ext_deps += iconv_dep
execinfo = cc.find_library('execinfo', required: false)
-eina_ext_deps += [execinfo]
+eina_ext_deps += execinfo
eina_c_args = [package_c_args, '-DEINA_BUILD']
+
if WINDOWS
bcrypt = cc.find_library('bcrypt', required: true)
- eina_ext_deps += [bcrypt]
+ eina_ext_deps += bcrypt
if iconv.found()
eina_c_args += '-DWINICONV_CONST='
endif
@@ -386,9 +384,8 @@ eina_lib = library('eina', eina_src,
version : meson.project_version()
)
-
eina = declare_dependency(
- include_directories: config_dir + [include_directories('.')],
+ include_directories: config_dir + include_directories('.'),
dependencies : eina_pub_deps + eina_deps,
link_with: eina_lib,
)
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index 296eb4db50..e749b0420e 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -85,7 +85,7 @@ eio = declare_dependency(
)
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files + pub_eo_types_files,
install_dir: eolian_include_dir / package_version_name
)
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index b2d2eb39b2..d3acfd7488 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -114,7 +114,7 @@ eldbus = declare_dependency(
#
# Only enable that again when the namespace problems are fixed. ref T8648
#
-#if get_option('install-eo-files')
+#if INSTALL_EO_FILES
# install_data(pub_eo_files + pub_eo_types_files,
# install_dir: eolian_include_dir / package_version_name
# )
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index f046ec75e8..d1ba990112 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -266,7 +266,7 @@ embed_config = custom_target('create_embedded_default_config',
command: [embed_script, '@INPUT@', '@OUTPUT@']
)
-elementary_headers_unstable = [
+elementary_headers_unstable = files(
'elm_gen_common.h',
'efl_access_object.h',
'efl_access_text.h',
@@ -374,9 +374,9 @@ elementary_headers_unstable = [
'efl_ui_tab_bar_private.h',
'efl_ui_tab_page_private.h',
'efl_ui_relative_container_private.h'
-]
+)
-elementary_pub_headers = [
+elementary_pub_headers = files(
'elc_ctxpopup.h',
'elc_ctxpopup_legacy.h',
'elc_combobox.h',
@@ -707,12 +707,12 @@ elementary_pub_headers = [
'elm_widget_item_container_eo.legacy.h',
'elm_widget_item_eo.legacy.h',
'elm_widget_item_static_focus_eo.legacy.h',
-]
+)
-elementary_header_src = [
+elementary_header_src = files(
'Elementary.h',
'Elementary_Cursor.h'
-] + elementary_pub_headers + elementary_headers_unstable
+) + elementary_pub_headers + elementary_headers_unstable
elementary_src = files(
'elm_priv.h',
@@ -979,12 +979,12 @@ if config_h.has('HAVE_DIRENT_H')
elm_options.set('ELM_DIRENT_H', '1')
endif
-if get_option('x11')
+if WITH_X11
config_h.set('HAVE_ELEMENTARY_X', '1')
elementary_deps += ecore_x
endif
-if get_option('wl')
+if WITH_WL
config_h.set('HAVE_ELEMENTARY_WL2', '1')
elementary_deps += ecore_wl2
elementary_ext_deps += declare_dependency(
@@ -993,12 +993,12 @@ if get_option('wl')
)
endif
-if get_option('drm')
+if WITH_DRM
config_h.set('HAVE_ELEMENTARY_DRM', '1')
elementary_deps += ecore_drm2
endif
-if get_option('cocoa')
+if WITH_COCOA
config_h.set('HAVE_ELEMENTARY_COCOA', '1')
elementary_deps += ecore_cocoa
endif
@@ -1019,7 +1019,7 @@ elm_package_c_args = package_c_args
elementary_lib = library('elementary',
elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
dependencies: elementary_pub_deps + elementary_deps + elementary_ext_deps,
- include_directories : config_dir + [include_directories('.')] + [include_directories('../../..')],
+ include_directories : config_dir + include_directories('.') + include_directories('../../..'),
install: true,
c_args : elm_package_c_args,
version : meson.project_version()
@@ -1032,7 +1032,7 @@ elementary = declare_dependency(
dependencies: elementary_pub_deps,
)
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files + pub_eo_types_files,
install_dir: eolian_include_dir / package_version_name
)
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index fd8e478d72..6799607021 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -43,7 +43,7 @@ emotion_deps = [ecore, eet, evas, eio, emile, buildsystem]
emotion_pub_deps = [eina, eo, efl]
emotion_ext_deps = [buildsystem_simple]
-if get_option('eeze')
+if WITH_EEZE
emotion_deps += [eeze]
endif
@@ -66,7 +66,7 @@ emotion = declare_dependency(
dependencies: emotion_pub_deps,
)
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_file,
install_dir: eolian_include_dir / package_version_name
)
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index c899015ed6..ab0f9b5951 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -1,11 +1,11 @@
eo_deps = []
eo_pub_deps = [eina]
-eo_ext_deps = [valgrind, dl, execinfo]
+eo_ext_deps = [valgrind_dep, dl, execinfo]
pub_eo_files = [
'efl_object.eo',
'efl_class.eo',
- 'efl_object_override.eo'
+ 'efl_object_override.eo',
]
eo_src = files(
@@ -21,7 +21,7 @@ eo_src = files(
)
pub_eo_types_files = [
- 'eina_types.eot'
+ 'eina_types.eot',
]
pub_eo_file_target = []
@@ -91,7 +91,7 @@ eo_dbg = declare_dependency(
dependencies: eo_deps + eo_pub_deps,
)
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_eo_files + pub_eo_types_files,
install_dir: eolian_include_dir / package_version_name
)
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 64d80dd582..0a272bf178 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -4,19 +4,10 @@
# as 'source :', later everything is build as libevas.so.
#
-png = dependency('libpng')
-tiff = dependency('libtiff-4', required: not get_option('evas-loaders-disabler').contains('tiff'))
giflib = cc.find_library('gif')
-webp = dependency('libwebp', version: ['>=0.5.0'], required: not get_option('evas-loaders-disabler').contains('webp'))
-webpdemux = dependency('libwebpdemux', version: ['>=0.5.0'], required: not get_option('evas-loaders-disabler').contains('webp'))
-libopenjp2 = dependency('libopenjp2', required: not get_option('evas-loaders-disabler').contains('jp2k'))
-libavif = dependency('libavif', required: not get_option('evas-loaders-disabler').contains('avif'), version: '>= 0.8.2')
-heif= dependency('libheif', required: not get_option('evas-loaders-disabler').contains('heif'))
-libjxl = dependency('libjxl', required: not get_option('evas-loaders-disabler').contains('jxl'), version: '>= 0.6.2')
-libjxl_threads = dependency('libjxl_threads', required: not get_option('evas-loaders-disabler').contains('jxl'), version: '>= 0.6.2')
evas_image_loaders_file = [
- ['avif', 'shared', [libavif]],
+ ['avif', 'shared', [avif_dep]],
['bmp', 'shared', []],
['eet', 'static', [eet]],
['generic', 'shared', [rt]],
@@ -24,36 +15,35 @@ evas_image_loaders_file = [
['heif', 'shared', []],
['ico', 'shared', []],
['jpeg', 'static', [jpeg_dep]],
- ['jp2k', 'shared', [libopenjp2]],
- ['jxl', 'shared', [libjxl, libjxl_threads]],
+ ['jp2k', 'shared', [openjp2_dep]],
+ ['jxl', 'shared', [jxl_dep, jxl_threads_dep]],
['pmaps', 'shared', []],
- ['png', 'static', [png]],
+ ['png', 'static', [png_dep]],
['psd', 'shared', []],
['qoi', 'shared', []],
['tga', 'shared', []],
['tgv', 'shared', [rg_etc, lz4]],
- ['tiff', 'shared', [tiff]],
+ ['tiff', 'shared', [tiff_dep]],
['wbmp', 'shared', []],
- ['webp', 'shared', [webp, webpdemux]],
+ ['webp', 'shared', [webp_dep, webpdemux_dep]],
['xpm', 'shared', []]
]
evas_image_savers_file = [
- ['avif', 'shared', [libavif]],
+ ['avif', 'shared', [avif_dep]],
['eet', 'static', [eet]],
['jpeg', 'static', [jpeg_dep]],
- ['jxl' , 'shared', [libjxl, libjxl_threads]],
- ['png', 'static', [png]],
+ ['jxl' , 'shared', [jxl_dep, jxl_threads_dep]],
+ ['png', 'static', [png_dep]],
['qoi', 'shared', []],
['tgv', 'shared', [rg_etc, lz4]],
- ['tiff', 'shared', [tiff]],
- ['webp', 'shared', [webp]],
+ ['tiff', 'shared', [tiff_dep]],
+ ['webp', 'shared', [webp_dep]],
]
-json = dependency('rlottie', required: not get_option('evas-loaders-disabler').contains('json'))
evas_vg_loaders_file = [
['eet', [eet]],
- ['json', [json]],
+ ['json', [json_dep]],
['svg', []],
]
@@ -62,7 +52,7 @@ evas_vg_savers_file = ['eet', 'svg']
rel_evas_modules = '../../../modules/evas/engines/software_generic'
evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem]
evas_ext_deps = [vg_common, draw_simple]
-evas_ext_none_static_deps = [buildsystem_simple, intl, m, valgrind, libunibreak, lua_dep]
+evas_ext_none_static_deps = [buildsystem_simple, intl, m, valgrind_dep, libunibreak, lua_dep]
pub_eo_file_target = []
priv_eo_files = []
@@ -106,10 +96,7 @@ foreach eo_file : pub_eo_files
'-gchd', '@INPUT@'])
endforeach
-
-pub_eo_types_files = [
-
-]
+pub_eo_types_files = []
foreach eo_file : pub_eo_types_files
pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
@@ -153,33 +140,29 @@ evas_src += files(
evas_src_opt = [ ]
-evas_ext_none_static_deps += dependency('freetype2')
+evas_ext_none_static_deps += freetype2_dep
-if get_option('fontconfig')
+if WITH_FONTCONFIG
config_h.set('HAVE_FONTCONFIG', '1')
- evas_ext_none_static_deps += dependency('fontconfig')
+ evas_ext_none_static_deps += fontconfig_dep
endif
-if get_option('fribidi')
+if WITH_FRIBIDI
config_h.set('HAVE_FRIBIDI', '1')
- evas_ext_none_static_deps += dependency('fribidi')
+ evas_ext_none_static_deps += fribidi_dep
endif
-if get_option('pixman')
+if WITH_PIXMAN
pixman_support = ['HAVE_PIXMAN', 'PIXMAN_FONT', 'PIXMAN_RECT', 'PIXMAN_LINE', 'PIXMAN_POLY', 'PIXMAN_IMAGE', 'PIXMAN_IMAGE_SCALE_SAMPLE']
foreach support : pixman_support
config_h.set(support, '1')
endforeach
- evas_ext_none_static_deps += dependency('pixman-1')
+ evas_ext_none_static_deps += pixman_dep
endif
-if get_option('hyphen')
+if WITH_HYPHEN
config_h.set('HAVE_HYPHEN', '1')
- hyphen = dependency('hyphen', required : false)
- if not hyphen.found()
- evas_ext_none_static_deps += cc.find_library('hyphen')
- endif
- evas_ext_none_static_deps += hyphen
+ evas_ext_none_static_deps += hyphen_dep
config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir'))
endif
@@ -194,18 +177,18 @@ subdir('vg')
gl_deps = []
-if get_option('harfbuzz')
- evas_ext_none_static_deps += dependency('harfbuzz')
+if WITH_HARFBUZZ
+ evas_ext_none_static_deps += harfbuzz_dep
config_h.set('HAVE_HARFBUZZ', '1')
endif
-if get_option('wl')
+if WITH_WL
evas_ext_none_static_deps += wayland_protocol
endif
-if get_option('opengl') != 'none'
- if get_option('opengl') == 'es-egl'
+if OPENGL != 'none'
+ if OPENGL == 'es-egl'
config_h.set('GL_GLES', '1')
# Angle library does not provide .pc files
if WINDOWS
@@ -228,11 +211,11 @@ if get_option('opengl') != 'none'
error('EGL library not found. Please make sure Angle library is installed, or disable OpenGL support.')
endif
else
- gl_deps += dependency('glesv2')
- gl_deps += dependency('egl')
+ gl_deps += glesv2_dep
+ gl_deps += egl_dep
endif
else
- gl_deps += dependency('gl')
+ gl_deps += gl_dep
endif
endif
@@ -346,7 +329,7 @@ evas_bin = declare_dependency(
include_directories : evas_include_directories
)
-if get_option('install-eo-files')
+if INSTALL_EO_FILES
install_data(pub_evas_eo_files + pub_evas_eot_files,
install_dir: eolian_include_dir / package_version_name
)
diff --git a/src/modules/ecore/system/systemd/meson.build b/src/modules/ecore/system/systemd/meson.build
index cf8f7db2d0..6b87864358 100644
--- a/src/modules/ecore/system/systemd/meson.build
+++ b/src/modules/ecore/system/systemd/meson.build
@@ -1,4 +1,4 @@
-if get_option('systemd')
+if WITH_SYSTEMD
ecore_systemd_mod = shared_module('systemd',
'ecore_system_systemd.c',
dependencies: [ecore, eldbus],
diff --git a/src/modules/ecore_evas/engines/cocoa/meson.build b/src/modules/ecore_evas/engines/cocoa/meson.build
index 0b1843ba51..d82a36f3a8 100644
--- a/src/modules/ecore_evas/engines/cocoa/meson.build
+++ b/src/modules/ecore_evas/engines/cocoa/meson.build
@@ -1,4 +1,4 @@
-if get_option('opengl') != 'none'
+if OPENGL != 'none'
config_h.set('BUILD_ECORE_EVAS_OPENGL_COCOA', '1')
endif
diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build
index d27282b870..a1b81eba28 100644
--- a/src/modules/ecore_evas/engines/drm/meson.build
+++ b/src/modules/ecore_evas/engines/drm/meson.build
@@ -1,7 +1,7 @@
engine_src = files('ecore_evas_drm.c')
engine_deps = [ecore_drm2, ecore_input, eeze, elput, libdrm, engine_drm]
-if get_option('opengl') != 'none'
+if OPENGL != 'none'
config_h.set('BUILD_ECORE_EVAS_GL_DRM', '1')
engine_deps += [engine_gl_drm]
endif
diff --git a/src/modules/ecore_evas/engines/wayland/meson.build b/src/modules/ecore_evas/engines/wayland/meson.build
index 85795bbf1a..8c4e6be5e3 100644
--- a/src/modules/ecore_evas/engines/wayland/meson.build
+++ b/src/modules/ecore_evas/engines/wayland/meson.build
@@ -1,4 +1,4 @@
-if get_option('opengl') == 'es-egl'
+if OPENGL == 'es-egl'
config_h.set('BUILD_ECORE_EVAS_WAYLAND_EGL', '1')
endif
diff --git a/src/modules/ecore_evas/engines/x/meson.build b/src/modules/ecore_evas/engines/x/meson.build
index 0ff13977e0..a3c6c880c6 100644
--- a/src/modules/ecore_evas/engines/x/meson.build
+++ b/src/modules/ecore_evas/engines/x/meson.build
@@ -7,7 +7,7 @@ engine_deps += [ecore_x, ecore_input]
engine_deps += engine_software_x11
-if get_option('opengl') != 'none'
+if OPENGL != 'none'
config_h.set('BUILD_ECORE_EVAS_OPENGL_X11', '1')
engine_deps += engine_gl_x11
endif
diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build
index 571cd41ed6..149dbc6ce4 100644
--- a/src/modules/ecore_evas/meson.build
+++ b/src/modules/ecore_evas/meson.build
@@ -1,10 +1,10 @@
engines = [
-['cocoa', ['cocoa']],
-['drm', ['drm']],
-['fb', ['fb']],
-['sdl', ['sdl']],
-['wayland', ['wl']],
-['x', ['x11']],
+ ['cocoa', ['cocoa']],
+ ['drm', ['drm']],
+ ['fb', ['fb']],
+ ['sdl', ['sdl']],
+ ['wayland', ['wl']],
+ ['x', ['x11']],
]
if not WINDOWS
@@ -27,20 +27,18 @@ foreach engine_conf : engines
engine_include_dir = []
engine_src = []
- config_h.set('BUILD_ECORE_EVAS_'+engine.to_upper(), '1')
+ config_h.set('BUILD_ECORE_EVAS_' + engine.to_upper(), '1')
mod_full_name = engine
mod_install_dir = dir_lib / package_name / 'engines' / engine / version_name
subdir('engines' / engine)
- module_files += mod_install_dir / 'lib'+mod_full_name + '.' + sys_mod_extension
+ module_files += mod_install_dir / 'lib' + mod_full_name + '.' + sys_mod_extension
endif
endforeach
-
-if get_option('vnc-server')
+if WITH_VNC_SERVER
mod_install_dir = dir_lib / package_name / engine / version_name
-
subdir('vnc_server')
endif
diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build
index 2476caa295..c227ef2cbf 100644
--- a/src/modules/ecore_imf/meson.build
+++ b/src/modules/ecore_imf/meson.build
@@ -1,22 +1,20 @@
mods = []
-if get_option('x11')
- mods +=['ibus', 'xim', 'scim']
+if WITH_X11
+ mods += ['ibus', 'xim', 'scim']
endif
-if get_option('wl')
+if WITH_WL
mods += ['wayland']
endif
-loader_disabler = get_option('ecore-imf-loaders-disabler')
-
foreach mod_name : mods
mod_src = []
mod_deps = []
- if not loader_disabler.contains(mod_name)
+ if not get_option('ecore-imf-loaders-disabler').contains(mod_name)
if mod_name == 'ibus'
- if not get_option('glib')
+ if not WITH_GLIB
error('Need glib enabled if ibus is enabled')
endif
endif
diff --git a/src/modules/emotion/meson.build b/src/modules/emotion/meson.build
index 0da4739918..829cb6dc3a 100644
--- a/src/modules/emotion/meson.build
+++ b/src/modules/emotion/meson.build
@@ -5,7 +5,7 @@ foreach emotion_loader : emotion_loaders
generic_deps = []
mod_install_dir = dir_lib / 'emotion/modules' / emotion_loader / version_name
- if get_option('gstreamer')
+ if WITH_GSTREAMER
subdir(emotion_loader)
module_files += mod_install_dir / 'lib'+emotion_loader+'.'+sys_mod_extension
config_h.set('EMOTION_BUILD_'+emotion_loader.to_upper(), 1)
diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index b21b83fd72..8602eccb98 100644
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -15,17 +15,17 @@ endif
have_gl_engine = false
-if get_option('opengl') != 'none'
+if OPENGL != 'none'
engines += [['gl_x11', ['x11']]]
have_gl_engine = true
endif
-if get_option('opengl') == 'full'
+if OPENGL == 'full'
engines += [['gl_cocoa', ['cocoa']]]
have_gl_engine = true
endif
-if get_option('opengl') == 'es-egl'
+if OPENGL == 'es-egl'
engines += [
['wayland_egl', ['wl']],
['gl_drm', ['drm']]
diff --git a/src/modules/evas/engines/software_x11/meson.build b/src/modules/evas/engines/software_x11/meson.build
index ec89a2279b..cd2c2f5936 100644
--- a/src/modules/evas/engines/software_x11/meson.build
+++ b/src/modules/evas/engines/software_x11/meson.build
@@ -21,7 +21,7 @@ engine_src = files(
#ecore_x_deps carries all the extensions etc. so we dont have to search them twice
#it looks weird but is right, gl_deps is needed for evas_x_egl.c
-engine_deps += [x11, ecore_x, ecore_x_ext_deps]
+engine_deps += [x11_dep, ecore_x, ecore_x_ext_deps]
shared_module(mod_full_name, engine_src,
include_directories : config_dir + [engine_include_dir],
diff --git a/src/static_libs/libunibreak/meson.build b/src/static_libs/libunibreak/meson.build
index 407ed9f3e7..715793e9e9 100644
--- a/src/static_libs/libunibreak/meson.build
+++ b/src/static_libs/libunibreak/meson.build
@@ -1,5 +1,5 @@
-if get_option('embedded-libunibreak')
- libunibreak_src = [
+if WITH_EMBEDDED_UNIBREAK
+ libunibreak_src = files(
'unibreakbase.h',
'unibreakdef.h',
'linebreak.h',
@@ -17,7 +17,7 @@ if get_option('embedded-libunibreak')
'graphemebreakdef.h',
'emojidef.h',
'emojidef.c',
- ]
+ )
libunibreak_lib = static_library('libunibreak',
libunibreak_src,
@@ -30,6 +30,4 @@ if get_option('embedded-libunibreak')
link_with: libunibreak_lib,
dependencies: eina,
)
-else
- libunibreak = dependency('libunibreak', version : '>=4.2')
endif
diff --git a/src/static_libs/lz4/meson.build b/src/static_libs/lz4/meson.build
index 00bd195e2a..878453713c 100644
--- a/src/static_libs/lz4/meson.build
+++ b/src/static_libs/lz4/meson.build
@@ -1,4 +1,4 @@
-if get_option('embedded-lz4')
+if WITH_EMBEDDED_LZ4
lz4_src = [
'lz4.c',
'lz4hc.c',
diff --git a/src/tests/ecore/meson.build b/src/tests/ecore/meson.build
index 5b89937496..34d6d8ae49 100644
--- a/src/tests/ecore/meson.build
+++ b/src/tests/ecore/meson.build
@@ -42,22 +42,22 @@ foreach eo_file : test_eo_files
'-gchd', '@INPUT@'])
endforeach
-if get_option('audio')
+if WITH_AUDIO
ecore_suite_deps += ecore_audio
ecore_suite_src += 'ecore_test_ecore_audio.c'
ecore_suite_src += test_eo_file_target
endif
-if get_option('fb')
+if WITH_FB
ecore_suite_deps += ecore_fb
ecore_suite_src += 'ecore_test_ecore_fb.c'
endif
-if get_option('drm')
+if WITH_DRM
ecore_suite_deps += ecore_drm2
endif
-if get_option('x11')
+if WITH_X11
ecore_suite_src += 'ecore_test_ecore_x.c'
ecore_suite_deps += ecore_x
endif
diff --git a/src/tests/ecore_wl2/meson.build b/src/tests/ecore_wl2/meson.build
index f289e064ae..0dc1b1dbbf 100644
--- a/src/tests/ecore_wl2/meson.build
+++ b/src/tests/ecore_wl2/meson.build
@@ -11,7 +11,7 @@ ecore_wl2_suite_src = [
wl2_test_gl_deps = []
-if get_option('opengl') == 'es-egl'
+if OPENGL == 'es-egl'
ecore_wl2_suite_src += 'ecore_wl2_tests_helper_egl.h'
wl2_test_gl_deps += dependency('egl')
wl2_test_gl_deps += dependency('gl')
diff --git a/src/tests/eo/suite/meson.build b/src/tests/eo/suite/meson.build
index 6d1c9df7d2..8cfc969403 100644
--- a/src/tests/eo/suite/meson.build
+++ b/src/tests/eo/suite/meson.build
@@ -1,4 +1,4 @@
-eo_suite_src = [
+eo_suite_src = files(
'eo_test_class_simple.c',
'eo_test_class_simple.h',
'eo_test_class_singleton.c',
@@ -19,14 +19,14 @@ eo_suite_src = [
'eo_test_init.c',
'eo_test_lifecycle.c',
'eo_test_reflection.c'
-]
+)
eo_suite = executable('eo_suite',
eo_suite_src,
- dependencies: [eo, check_dep, valgrind],
+ dependencies: [eo, check_dep, valgrind_dep],
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"']
)
test('eo-suite', eo_suite,
@@ -36,11 +36,11 @@ test('eo-suite', eo_suite,
eo_suite = executable('eo_suite_dbg',
eo_suite_src,
- dependencies: [eo_dbg, check_dep, valgrind],
+ dependencies: [eo_dbg, check_dep, valgrind_dep],
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
'-DEO_DEBUG=1',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"']
)
test('eo-suite-dbg', eo_suite,
@@ -50,12 +50,12 @@ test('eo-suite-dbg', eo_suite,
eo_suite = executable('eo_suite_fallback',
eo_suite_src,
- dependencies: [eo_dbg, check_dep, valgrind],
+ dependencies: [eo_dbg, check_dep, valgrind_dep],
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
'-DEO_DEBUG=1',
'-D_EO_ADD_FALLBACK_FORCE=1',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"']
)
test('eo-suite-fallback', eo_suite,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
