From 0b849787cd825f5d4e5b16f1e64552ecb10d0b76 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 21 Mar 2018 11:43:49 +0100 Subject: Fix CBFlib detection --- config.h.cmake.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config.h.cmake.in') 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 -- cgit v1.2.3