mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: better errors for image loader deps

Browse Source 
Helps people avoid libjpeg or libwebp if they don't want them.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
This commit is contained in:
Pekka Paalanen
2018-12-31 14:40:01 +02:00
parent d64649b56b
commit 4da8141255
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/meson.build
+9 -2
View File
@@ -45,14 +45,21 @@ endif
if get_option('image-jpeg') if get_option('image-jpeg')
dep_libjpeg = dependency('libjpeg', required: false) dep_libjpeg = dependency('libjpeg', required: false)
if not dep_libjpeg.found() if not dep_libjpeg.found()
dep_libjpeg = cc.find_library('jpeg') dep_libjpeg = cc.find_library('jpeg', required: false)
endif
if not dep_libjpeg.found()
error('JPEG image loading requires libjpeg or jpeg, neither was found. Or, you can use \'-Dimage-jpeg=false\'.')
endif endif
deps_cairo_shared += dep_libjpeg deps_cairo_shared += dep_libjpeg
config_h.set('HAVE_JPEG', '1') config_h.set('HAVE_JPEG', '1')
endif endif
if get_option('image-webp') if get_option('image-webp')
deps_cairo_shared += dependency('libwebp') dep_webp = dependency('libwebp', required: false)
if not dep_webp.found()
error('WEBP image loading requires libwebp which was not found. Or, you can use \'-Dimage-webp=false\'.')
endif
deps_cairo_shared += dep_webp
config_h.set('HAVE_WEBP', '1') config_h.set('HAVE_WEBP', '1')
endif endif