diff options
| author | Thomas White <taw@physics.org> | 2019-04-16 17:25:50 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-04-16 17:26:27 +0200 |
| commit | 50a3cb06809bae0f56e5063e5e051a6d04502b99 (patch) | |
| tree | 2f46a4f00ed1ec9fac7bb674837400a69499cab0 | |
| parent | 6462dabdb52c14437f4e72de0a09d5efb04285f6 (diff) | |
Clean up residual CBFlib stuff
| -rw-r--r-- | CMake/FindCBF.cmake | 31 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | libcrystfel/config.h.cmake.in | 8 |
3 files changed, 1 insertions, 46 deletions
diff --git a/CMake/FindCBF.cmake b/CMake/FindCBF.cmake deleted file mode 100644 index e51fd01a..00000000 --- a/CMake/FindCBF.cmake +++ /dev/null @@ -1,31 +0,0 @@ -# - Find CBF -# Find the native CBF includes and library -# -# CBF_INCLUDES - where to find cbf.h -# CBF_LIBRARIES - List of libraries when using CBF. -# CBF_FOUND - True if CBF found. - -if (CBF_INCLUDES) - # Already in cache, be silent - set (CBF_FIND_QUIETLY TRUE) -endif (CBF_INCLUDES) - -find_path (CBF_CBF_INCLUDES cbf/cbf.h) -find_path (CBFLIB_CBF_INCLUDES cbflib/cbf.h) - -if (NOT CBF_CBF_INCLUDES MATCHES "NOTFOUND") - message(STATUS "Found cbf/cbf.h in ${CBF_CBF_INCLUDES}") - set(CBF_INCLUDES ${CBF_CBF_INCLUDES}) - set(HAVE_CBF_CBF_H ON) -elseif (NOT CBFLIB_CBF_INCLUDES MATCHES "NOTFOUND") - message(STATUS "Found cbflib/cbf.h in ${CBFLIB_CBF_INCLUDES}") - set(CBF_INCLUDES ${CBFLIB_CBF_INCLUDES}) - set(HAVE_CBFLIB_CBF_H ON) -endif (NOT CBF_CBF_INCLUDES MATCHES "NOTFOUND") - -find_library (CBF_LIBRARIES NAMES cbf) - -# handle the QUIETLY and REQUIRED arguments and set CBF_FOUND to TRUE if -# all listed variables are TRUE -include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (CBF DEFAULT_MSG CBF_LIBRARIES CBF_INCLUDES) @@ -129,7 +129,7 @@ $ sudo make install At a minimum, you will need the HDF5 library (version 1.8.0 or later) and the GNU Scientific Library (GSL). For a full installation, you will also need -libTIFF, libPNG, Cairo, FFTW3, CBFLib and GTK2. All of these should be +libTIFF, libPNG, Cairo, FFTW3 and GTK2. All of these should be installed from your distribution's package manager. Be sure to install the development files for each package, which will have a name like "gtk+-2.0-dev" or "gtk+-2.0-devel", depending on which distribution you use. @@ -142,12 +142,6 @@ cmake -DXGANDALF_INCLUDES=/path/to/xgandalf/include \ The path to HDF5 can be set similarly: cmake -DHDF5_ROOT=/path/to/hdf5 (... /include, /lib etc) -Or for CBF, use one of: --DCBF_CBF_INCLUDES=/path/to/cbflib/include (... /cbf/cbf.h) --DCBFLIB_CBF_INCLUDES=/path/to/cbflib/include (... /cbflib/cbf.h) -and: --DCBF_LIBRARIES=/path/to/libcbf.so - To install CrystFEL in a custom location, use: -DCMAKE_INSTALL_PREFIX=/path/for/crystfel/installation diff --git a/libcrystfel/config.h.cmake.in b/libcrystfel/config.h.cmake.in index 61f458f8..ea26c1a2 100644 --- a/libcrystfel/config.h.cmake.in +++ b/libcrystfel/config.h.cmake.in @@ -7,14 +7,6 @@ #cmakedefine HAVE_FDIP #cmakedefine HAVE_CURSES -/* 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 - #cmakedefine HAVE_FORKPTY_PTY_H #cmakedefine HAVE_FORKPTY_UTIL_H |