From 9f45f61e478049717944e8920513e9494cb6ff60 Mon Sep 17 00:00:00 2001 From: John Marshall Date: Mon, 1 Apr 2019 23:08:48 +0100 Subject: [PATCH] meson build: improve lcms dependency handling --- babl/base/meson.build | 2 +- meson.build | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/babl/base/meson.build b/babl/base/meson.build index fa76e37..97ec38b 100644 --- a/babl/base/meson.build +++ b/babl/base/meson.build @@ -19,5 +19,5 @@ babl_base_sources = [ babl_base = static_library('babl_base', babl_base_sources, include_directories: [ rootInclude, bablInclude, ], - dependencies: [ math, ], + dependencies: [ math, lcms], ) diff --git a/meson.build b/meson.build index ab28dfd..89c733a 100644 --- a/meson.build +++ b/meson.build @@ -282,14 +282,14 @@ endif # Dependencies # LCMS -with_lcms = get_option('with-lcms') -if with_lcms - lcms = cc.find_library('lcms2', required : true) +if get_option('with-lcms') + lcms = dependency('lcms2', required : true) if lcms.found() - conf.set('HAVE_LCMS', 1, description: 'Define to 1 if liblcms2 is available') + conf.set('HAVE_LCMS', 1, description: + 'Define to 1 if liblcms2 is available') endif else - lcms = dependency('', required : false) + lcms = declare_dependency() endif math = cc.find_library('m', required: false) -- 2.30.2