meson build: improve lcms dependency handling

diff --git a/babl/base/meson.build b/babl/base/meson.build
index fa76e379917467eb37060fc08340c5ca52ce21a8..97ec38b23c6502d9123ee51d8e96ce608b2893cb 100644 (file)
--- 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 ab28dfdf7f7b378d4e01545d1a0d81e3c2eb8b6a..89c733a16790200c1171d3ce6142edb51b1314da 100644 (file)
--- 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)