build - handle g-main-loop enabled when glib not as an error in meson

also enable glib now in ci
This commit is contained in:
Carsten Haitzler 2019-11-27 17:47:55 +00:00
parent 59bcc3c658
commit 0ecbb416ad
2 changed files with 6 additions and 2 deletions

View File

@ -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"

View File

@ -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