From 5a4b10ea4c0dbbc56fb880afb4ae3ac16f756295 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 6 Jun 2023 15:10:08 +0200 Subject: Meson: Look for msgpack-c and msgpack The pkg-config name for MsgPack has unhelpfully changed: https://github.com/msgpack/msgpack-c/blob/c_master/CHANGELOG.md#-breaking-changes- --- libcrystfel/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 592ec22e..8897aaae 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -66,7 +66,10 @@ if ccp4dep.found() conf_data.set10('HAVE_LIBCCP4', true) endif -msgpackdep = dependency('msgpack', required: false) +msgpackdep = dependency('msgpack-c', required: false) +if not msgpackdep.found() + msgpackdep = dependency('msgpack', required: false) +endif if msgpackdep.found() conf_data.set10('HAVE_MSGPACK', true) endif -- cgit v1.2.3