improve bin dependency checking

png, libtiff, lcms2 dep checking can be conditional. Remove zlib dependency as nobody is using it.
mesonbuild · Oct 25, 2021 · c482bad · c482bad
1 parent d5eb510
commit c482bad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/subprojects/packagefiles/libopenjp2/src/bin/jp2/meson.build b/subprojects/packagefiles/libopenjp2/src/bin/jp2/meson.build
@@ -25,7 +25,7 @@ openjp2_c_args = []
 foreach exe :  ['opj_decompress', 'opj_compress', 'opj_dump']
   exe_c = exe + '.c'
   exe_src = [exe_c] + common_srcs
-  exe_deps = [libopenjp2_dep, libpng_dep, libtiff_dep, liblcms2_dep, zlib_dep, rt_dep, m_dep]
+  exe_deps = [libopenjp2_dep, libpng_dep, libtiff_dep, liblcms2_dep, rt_dep, m_dep]
   exe_exe = executable (exe, exe_src
                         , c_args : openjp2_c_args
                         , include_directories : inc_dirs

diff --git a/subprojects/packagefiles/libopenjp2/src/bin/meson.build~HEAD b/subprojects/packagefiles/libopenjp2/src/bin/meson.build~HEAD
@@ -2,21 +2,19 @@
 
 cappdata = configuration_data()
 
-zlib_dep = dependency('zlib')
-
-libpng_dep = dependency('libpng')
+libpng_dep = dependency('libpng', required : false)
 if libpng_dep.found()
   cappdata.set('OPJ_HAVE_LIBPNG', 1)
   cappdata.set('OPJ_HAVE_PNG_H', 1)
 endif
 
-libtiff_dep = dependency('libtiff-4')
+libtiff_dep = dependency('libtiff-4', required : false)
 if libtiff_dep.found()
   cappdata.set('OPJ_HAVE_LIBTIFF', 1)
   cappdata.set('OPJ_HAVE_TIFF_H', 1)
 endif
 
-liblcms2_dep = dependency('lcms2')
+liblcms2_dep = dependency('lcms2', required : false)
 if liblcms2_dep.found()
   cappdata.set('OPJ_HAVE_LIBLCMS2', 1)
   cappdata.set('OPJ_HAVE_LCMS2_H', 1)