From 5b949129a5da9b1722c723c9f30f84d8dd27e26d Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 11 Oct 2017 14:57:10 +0200 Subject: meson: do not require libtiff --- plugins/file/meson.build | 20 +++++++++++--------- plugins/mock/meson.build | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/file/meson.build b/plugins/file/meson.build index 525a06c..47273dd 100644 --- a/plugins/file/meson.build +++ b/plugins/file/meson.build @@ -1,10 +1,12 @@ -tiff_dep = dependency('libtiff-4') +tiff_dep = dependency('libtiff-4', required: false) -plugin = shared_library('ucafile', - sources: ['uca-file-camera.c'], - include_directories: include_dir, - dependencies: deps + [tiff_dep], - link_with: lib, - install: true, - install_dir: plugindir, -) +if tiff_dep.found() + shared_library('ucafile', + sources: ['uca-file-camera.c'], + include_directories: include_dir, + dependencies: deps + [tiff_dep], + link_with: lib, + install: true, + install_dir: plugindir, + ) +endif diff --git a/plugins/mock/meson.build b/plugins/mock/meson.build index 1f74002..90fb608 100644 --- a/plugins/mock/meson.build +++ b/plugins/mock/meson.build @@ -1,6 +1,6 @@ libm = meson.get_compiler('c').find_library('m') -plugin = shared_library('ucamock', +shared_library('ucamock', sources: ['uca-mock-camera.c'], include_directories: include_dir, dependencies: deps + [libm], -- cgit v1.2.3