bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=88a0b9dc680bca21b937190c99c60572c344df33
commit 88a0b9dc680bca21b937190c99c60572c344df33 Author: Marcel Hollerbach <[email protected]> Date: Wed Dec 27 16:07:34 2017 +0000 move jpeg detection to extern --- header_checks/meson.build | 7 +++++++ src/lib/eet/meson.build | 2 +- src/lib/emile/meson.build | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/header_checks/meson.build b/header_checks/meson.build index 259dae314c..5c2f6db801 100644 --- a/header_checks/meson.build +++ b/header_checks/meson.build @@ -164,3 +164,10 @@ config_h.set('VMIN', version_minor) config_h.set('VMIC', version_micro) config_h.set('VREV', '0') config_h.set_quoted('SHARED_LIB_SUFFIX', '.so') + +#jpeg detection ... life is a bit more complex there + +jpeg = dependency('libjpeg', required: false) +if jpeg.found() == false + jpeg = cc.find_library('jpeg') +endif \ No newline at end of file diff --git a/src/lib/eet/meson.build b/src/lib/eet/meson.build index db17870de7..87c35934b6 100644 --- a/src/lib/eet/meson.build +++ b/src/lib/eet/meson.build @@ -17,7 +17,7 @@ eet_src = [ 'eet_utils.c', ] -eet_deps += cc.find_library('jpeg') +eet_deps += jpeg eet_deps += rg_etc eet_lib = library('eet', diff --git a/src/lib/emile/meson.build b/src/lib/emile/meson.build index 19430dfe26..54c464a52e 100644 --- a/src/lib/emile/meson.build +++ b/src/lib/emile/meson.build @@ -15,7 +15,7 @@ emile_src = [ ] emile_dep = [] -emile_dep += cc.find_library('jpeg') +emile_dep += jpeg emile_dep += dependency('zlib') if (get_option('crypto') == 'gnutls') --
