diff options
| author | Thomas White <taw@physics.org> | 2018-03-21 11:43:49 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-03-21 16:55:20 +0100 |
| commit | 0b849787cd825f5d4e5b16f1e64552ecb10d0b76 (patch) | |
| tree | 44d1f0e017710e913c6d695bcb6b68edb8ec9e8a /config.h.cmake.in | |
| parent | 12e5aaa14841a7b6b8b80a1e32a2512354801f10 (diff) | |
Fix CBFlib detection
Diffstat (limited to 'config.h.cmake.in')
| -rw-r--r-- | config.h.cmake.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config.h.cmake.in b/config.h.cmake.in index cf124972..1188c90e 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -8,7 +8,14 @@ #cmakedefine HAVE_TIFF #cmakedefine HAVE_XGANDALF #cmakedefine HAVE_FDIP + +/* We avoid adding the full path to cbf.h, because CBFlib unhelpfully installs + * some conflicting HDF5 headers which we want to keep out of the include path. + * Unfortunately, sometimes CBFlib installs cbf/cbf.h, other times cbflib/cbf.h. + * These defines tell whether we have CBFlib at all, and if so, what to #include */ #cmakedefine HAVE_CBFLIB +#cmakedefine HAVE_CBF_CBF_H +#cmakedefine HAVE_CBFLIB_CBF_H /* Implement us .... */ #undef HAVE_CURSES |