summaryrefslogtreecommitdiff
path: root/jpegutils
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-02-22 11:38:57 +0100
committerIñigo Martínez <inigomartinez@gmail.com>2018-02-27 08:30:00 +0100
commit29fab0f8232d7c57d867745e5fedf9b707d8575e (patch)
treec8d49ac90b1ef860d0e9c042253bdf3912de9b6b /jpegutils
parentdaf0193de1ab25d2fd62b37103d634f214d542a6 (diff)
downloadeog-29fab0f8232d7c57d867745e5fedf9b707d8575e.tar.gz
build: Improve jpegutils handling
Add explicitly jpegutils when libjpeg option is enabled, instead of using an empty string when the option is disabled. https://bugzilla.gnome.org/show_bug.cgi?id=793719
Diffstat (limited to 'jpegutils')
-rw-r--r--jpegutils/meson.build10
1 files changed, 6 insertions, 4 deletions
diff --git a/jpegutils/meson.build b/jpegutils/meson.build
index 87f65ab0..0db03109 100644
--- a/jpegutils/meson.build
+++ b/jpegutils/meson.build
@@ -7,10 +7,12 @@ endif
libjpegutils = static_library(
'eog-jpegutils',
sources: sources,
- include_directories: top_inc
+ include_directories: top_inc,
+ dependencies: libjpeg_dep
)
-jpeg_deps += declare_dependency(
- link_with: libjpegutils,
- include_directories: include_directories('.')
+libjpegutils_dep = declare_dependency(
+ include_directories: include_directories('.'),
+ dependencies: libjpeg_dep,
+ link_with: libjpegutils
)