Module: Mesa Branch: master Commit: 2515eb63f818eb4bcbe104718c9bfb2db6f77cc5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2515eb63f818eb4bcbe104718c9bfb2db6f77cc5
Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Wed Oct 18 12:06:16 2017 +0100 meson: move expat dependency where it's needed Suggested-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> --- src/intel/common/meson.build | 2 +- src/intel/tools/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index 6b0af929d9..db7d74a26d 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -40,6 +40,6 @@ libintel_common = static_library( files_libintel_common, include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args], - dependencies : dep_libdrm, + dependencies : [dep_expat, dep_libdrm], build_by_default : false, ) diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index 91092fdb51..1996d5208f 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -31,7 +31,7 @@ aubinator = executable( aubinator_error_decode = executable( 'aubinator_error_decode', files('aubinator_error_decode.c', 'disasm.c', 'gen_disasm.h'), - dependencies : [dep_expat, dep_zlib, dep_thread], + dependencies : [dep_zlib, dep_thread], include_directories : [inc_common, inc_intel], link_with : [libintel_common, libintel_compiler, libmesa_util], c_args : [c_vis_args, no_override_init_args], _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit