[eog] build: Improve jpegutils handling
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] build: Improve jpegutils handling
- Date: Tue, 27 Feb 2018 07:31:24 +0000 (UTC)
commit 29fab0f8232d7c57d867745e5fedf9b707d8575e
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu Feb 22 11:38:57 2018 +0100
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
jpegutils/meson.build | 10 ++++++----
meson.build | 4 ----
src/meson.build | 6 +++++-
3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/jpegutils/meson.build b/jpegutils/meson.build
index 87f65ab..0db0310 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
)
diff --git a/meson.build b/meson.build
index 1c05900..1b8b689 100644
--- a/meson.build
+++ b/meson.build
@@ -138,16 +138,12 @@ if enable_xmp
endif
# Jpeg (semi-optional)
-jpeg_deps = []
-
enable_libjpeg = get_option('libjpeg')
if enable_libjpeg
libjpeg_dep = dependency('libjpeg', required: false)
assert(cc.has_function('jpeg_destroy_decompress', dependencies: libjpeg_dep) and
cc.has_header('jpeglib.h', dependencies: libjpeg_dep),
'libjpeg support requested but library not found. Please use -Dlibjpeg=false (some programs using
GTK+ may not work properly)')
- jpeg_deps += libjpeg_dep
-
if not cc.has_function('jpeg_simple_progression', dependencies: libjpeg_dep)
message('JPEG library does not support progressive saving.')
endif
diff --git a/src/meson.build b/src/meson.build
index 0c985bf..4dec3c0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -129,7 +129,7 @@ sources += gnome.genmarshal(
internal: true
)
-deps = eog_deps + jpeg_deps
+deps = eog_deps
libeog_cflags = cflags + [
'-DEOG_PLUGIN_DIR="@0@"'.format(eog_pluginsdir),
@@ -145,6 +145,10 @@ if have_version_script
ldflags += '-Wl,--version-script,@0@'.format(symbol_map)
endif
+if enable_libjpeg
+ deps += libjpegutils_dep
+endif
+
libeog = shared_library(
meson.project_name(),
sources: sources,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]