diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-27 17:47:55 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-27 17:51:54 +0000 |
| commit | 0ecbb416ad570d068b6a0b7115c52a32b0dc8b8b (patch) | |
| tree | d981e8ad48483b57ed89b7a035f97199ccf28b04 | |
| parent | 59bcc3c658f1a9f11593d475d1601ed209763a08 (diff) | |
| download | efl-0ecbb416ad570d068b6a0b7115c52a32b0dc8b8b.tar.gz | |
build - handle g-main-loop enabled when glib not as an error in meson
also enable glib now in ci
| -rwxr-xr-x | .ci/ci-configure.sh | 2 | ||||
| -rw-r--r-- | src/lib/ecore/meson.build | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 0cccda0eec..b588f6f443 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -18,7 +18,7 @@ if [ "$DISTRO" != "" ] ; then # - No libelogind, Xgesture packages in fedora 30 repo # - RPM fusion repo for xine and libvlc ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ - -Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \ + -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \ -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=gstreamer,libvlc,xine \ -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \ -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true" diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build index 5e777ae750..34c32e753d 100644 --- a/src/lib/ecore/meson.build +++ b/src/lib/ecore/meson.build @@ -185,7 +185,11 @@ if get_option('glib') == true and sys_windows == false endif if get_option('g-mainloop') == true - config_h.set('USE_G_MAIN_LOOP', '1') + if get_option('glib') == false + error('g-mainloop enabled by glib not. Please enable with -Dglib=true') + else + config_h.set('USE_G_MAIN_LOOP', '1') + endif endif if get_option('systemd') == true |