diff options
| author | Thomas White <taw@physics.org> | 2023-06-06 15:10:08 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-06-06 15:10:08 +0200 |
| commit | 5a4b10ea4c0dbbc56fb880afb4ae3ac16f756295 (patch) | |
| tree | 54746bde42a2d4524b37dcec812bfcb0874b97c6 /libcrystfel | |
| parent | f2c82d7f2eb45ca8c2c1a01dca2e3f8a017ec0e3 (diff) | |
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-
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
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 |