From f6046f8bb4a89887b3f3b0024eeab23b83eb6339 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 27 Feb 2020 18:25:03 -0800 Subject: Fix double-quoted version when building without git Use pkg-config for libtiff dependency Fixes #228 --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 648b7d1..6a48cbf 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project( default_options: ['buildtype=debugoptimized', 'c_std=c99'], ) -version = '"@0@"'.format(meson.project_version()) +version = '@0@'.format(meson.project_version()) prog_git = find_program('git', required: false) if prog_git.found() git_description = run_command([prog_git.path(), 'describe', '--dirty', '--always', '--tags']) @@ -102,7 +102,7 @@ files_msg = files('src/imv_msg.c', 'src/ipc_common.c') enabled_backends = [] foreach backend : [ ['freeimage', 'library', 'freeimage'], - ['libtiff', 'library', 'tiff'], + ['libtiff', 'dependency', 'libtiff-4', []], ['libpng', 'dependency', 'libpng', []], ['libjpeg', 'dependency', 'libturbojpeg', []], ['librsvg', 'dependency', 'librsvg-2.0', '>= 2.44'], -- cgit v1.2.3