From 3400d1416d8eb07b21595638c6d6e738bd6b1ccc Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 21 Jun 2018 12:06:47 +0200 Subject: Fix OpenCL tests and includes --- CMakeLists.txt | 1 + config.h.cmake.in | 1 + libcrystfel/config.h.cmake.in | 1 - src/cl-utils.c | 4 ++++ src/diffraction-gpu.c | 4 ++++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfd1afa6..63ef99f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ check_include_file(fcntl.h HAVE_FCNTL_H) check_include_file(stdlib.h HAVE_STDLIB_H) check_include_file(unistd.h HAVE_UNISTD_H) +# If we supposedly have OpenCL, check if the header is actually "CL/cl.h" if (OpenCL_FOUND) check_include_file(CL/cl.h HAVE_CL_CL_H "-I${OpenCL_INCLUDE_DIRS}") endif (OpenCL_FOUND) diff --git a/config.h.cmake.in b/config.h.cmake.in index a218026c..2dd5d5dd 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -6,6 +6,7 @@ #cmakedefine HAVE_TIFF #cmakedefine HAVE_CAIRO #cmakedefine HAVE_OPENCL +#cmakedefine HAVE_CL_CL_H #cmakedefine HAVE_CLOCK_GETTIME #define PACKAGE_VERSION "${CRYSTFEL_VERSION}" diff --git a/libcrystfel/config.h.cmake.in b/libcrystfel/config.h.cmake.in index d1e27a9a..61f458f8 100644 --- a/libcrystfel/config.h.cmake.in +++ b/libcrystfel/config.h.cmake.in @@ -3,7 +3,6 @@ #cmakedefine HAVE_CLOCK_GETTIME #cmakedefine HAVE_CPU_AFFINITY #cmakedefine HAVE_FFTW -#cmakedefine HAVE_CL_CL_H #cmakedefine HAVE_XGANDALF #cmakedefine HAVE_FDIP #cmakedefine HAVE_CURSES diff --git a/src/cl-utils.c b/src/cl-utils.c index b3ce0de0..a7e500cd 100644 --- a/src/cl-utils.c +++ b/src/cl-utils.c @@ -34,7 +34,11 @@ #include #include +#ifdef HAVE_CL_CL_H #include +#else +#include +#endif #include "utils.h" diff --git a/src/diffraction-gpu.c b/src/diffraction-gpu.c index 8c21586a..ea50b3fa 100644 --- a/src/diffraction-gpu.c +++ b/src/diffraction-gpu.c @@ -38,7 +38,11 @@ #include #include +#ifdef HAVE_CL_CL_H #include +#else +#include +#endif #include "image.h" #include "utils.h" -- cgit v1.2.3