diff options
| author | Thomas White <taw@physics.org> | 2021-04-23 18:05:22 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-04-23 18:05:22 +0200 |
| commit | 7d3a20f3d5209297575189839c7bf1ac64ceb96a (patch) | |
| tree | f96b12447b4936d34c713a7f52413a1e2e5fbb99 /libcrystfel/CMakeLists.txt | |
| parent | a378be62b61d4c8a67c5523955babbd3f9d17b5c (diff) | |
Fix build without MsgPack
Diffstat (limited to 'libcrystfel/CMakeLists.txt')
| -rw-r--r-- | libcrystfel/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt index 7bf301f0..26ac2302 100644 --- a/libcrystfel/CMakeLists.txt +++ b/libcrystfel/CMakeLists.txt @@ -7,6 +7,7 @@ pkg_check_modules(FDIP fdip) find_package(ZLIB REQUIRED) find_package(FLEX REQUIRED) find_package(BISON REQUIRED) +pkg_check_modules(MSGPACK msgpack) find_package(Doxygen) pkg_check_modules(FFTW fftw3) pkg_check_modules(LIBCCP4 libccp4c) @@ -18,6 +19,7 @@ set(HAVE_FFTW ${FFTW_FOUND}) set(HAVE_XGANDALF ${XGANDALF_FOUND}) set(HAVE_PINKINDEXER ${PINKINDEXER_FOUND}) set(HAVE_FDIP ${FDIP_FOUND}) +set(HAVE_MSGPACK ${MSGPACK_FOUND}) set(HAVE_LIBCCP4 ${LIBCCP4_FOUND}) # Recent enough version of zlib? @@ -61,6 +63,7 @@ set(LIBCRYSTFEL_SOURCES src/image-cbf.c src/image-hdf5.c src/fom.c + src/image-msgpack.c ${BISON_symopp_OUTPUTS} ${FLEX_symopl_OUTPUTS} src/indexers/dirax.c @@ -103,10 +106,6 @@ set(LIBCRYSTFEL_HEADERS src/fom.h ) -if (MSGPACK_FOUND) - set(LIBCRYSTFEL_SOURCES ${LIBCRYSTFEL_SOURCES} src/image-msgpack.c) -endif (MSGPACK_FOUND) - if (DOXYGEN_FOUND) configure_file(${PROJECT_SOURCE_DIR}/doc/index.md index.md) set(DOXYGEN_SHOW_INCLUDE_FILES NO) |