Merge pull request #69 from elgw/dev

small fixes

CMakeLists.txt

@@ -240,6 +240,7 @@ find_package(OpenCL)
 if(OpenCL_FOUND)
   message("Will use OpenCL")
   target_link_libraries(dw ${OpenCL_LIBRARIES})
+  target_include_directories(dw PRIVATE ${OpenCL_INCLUDE_DIRS})
   add_definitions(-DOPENCL)
   add_definitions(-DVKFFT_BACKEND=3)
   target_include_directories(dw PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/VkFFT/vkFFT/)

USAGE.md

@@ -101,11 +101,11 @@ along with a log file called `dw_dapi_001.tif.log.txt`.
 For a list of the available command line options, please see:
 
 ``` shell
-dw_bw --help
 dw --help
+dw_bw --help
 ```
 
-On Linux/Mac there should also be a manual installed, which can be
+On Linux/Mac there should also be manuals installed which can be
 opened by:
 
 ``` shell

makefile

@@ -262,25 +262,26 @@ endif
 ## OpenMP
 ##
 
-OMP?=1
-ifeq ($(OMP), 1)
+# OpenMP is required. On windows, compile
+# with clang
+
 $(info -- Enabling OpenMP (OMP))
 ifeq ($(UNAME_S), Darwin)
 CFLAGS+=-Xpreprocessor -fopenmp
 dw_LIBRARIES += -lomp
 dwbw_LIBRARIES += -lomp
 else
-CFLAGS += -fopenmp
 ifeq ($(CC),clang)
-CFLAGS+=-fopenmp=libiomp5
-endif
-endif
+# Ubuntu 24: requires also
+# sudo apt-get install libomp-dev libclang-rt-dev
+CFLAGS+=-fopenmp=libomp
 else
-CFLAGS += -fno-openmp
-$(info OMP disabled)
+CFLAGS += -fopenmp
+endif
 endif
 
 
+
 ##
 ## GPU VKFFT + OpenCL
 ##