From 86c9551f08a28db25ff4966093114a92eb92f6bb Mon Sep 17 00:00:00 2001 From: Tomas Farago Date: Fri, 12 Jun 2020 14:07:01 +0200 Subject: Fix undefined CL_TARGET_OPENCL_VERSION warning This is hardcoded to 120 (= OpenCL 1.2) because nvidia does not support later standards until 3.0 comes around and we do not make use of later features anyway. --- contrib/CMakeLists.txt | 5 +++++ contrib/config.h.in | 1 + contrib/config.h.meson.in | 1 + contrib/meson.build | 8 ++++++++ contrib/ufo-med-mad-reject-2d-task.c | 1 + contrib/ufo-med-mad-reject-task.c | 1 + contrib/ufo-ocl-1liner-task.c | 1 + contrib/ufo-stat-monitor-task.c | 1 + contrib/ufo-sxc-common.c | 1 + deps/oclfft/oclFFT.h | 1 + src/CMakeLists.txt | 1 + src/common/ufo-common.c | 1 - src/common/ufo-common.h | 1 + src/config.h.in | 1 + src/config.h.meson.in | 1 + src/meson.build | 1 + src/ufo-average-task.c | 1 + src/ufo-backproject-task.c | 1 + src/ufo-bin-task.c | 1 + src/ufo-binarize-task.c | 1 + src/ufo-blur-task.c | 1 + src/ufo-buffer-task.c | 1 + src/ufo-calculate-task.c | 1 + src/ufo-camera-task.c | 1 + src/ufo-center-of-rotation-task.c | 1 + src/ufo-clip-task.c | 1 + src/ufo-concatenate-result-task.c | 1 + src/ufo-cone-beam-projection-weight-task.c | 1 + src/ufo-contrast-task.c | 1 + src/ufo-correlate-stacks-task.c | 1 + src/ufo-crop-task.c | 1 + src/ufo-cut-sinogram-task.c | 1 + src/ufo-cut-task.c | 1 + src/ufo-denoise-task.c | 1 + src/ufo-detect-edge-task.c | 1 + src/ufo-dfi-sinc-task.c | 1 + src/ufo-dummy-data-task.c | 1 + src/ufo-dump-ring-task.c | 1 + src/ufo-duplicate-task.c | 1 + src/ufo-fft-task.c | 1 + src/ufo-fftmult-task.c | 1 + src/ufo-filter-particle-task.c | 1 + src/ufo-filter-stripes-task.c | 1 + src/ufo-filter-stripes1d-task.c | 1 + src/ufo-filter-task.c | 1 + src/ufo-find-large-spots-task.c | 1 + src/ufo-flat-field-correct-task.c | 1 + src/ufo-flatten-inplace-task.c | 1 + src/ufo-flatten-task.c | 1 + src/ufo-flip-task.c | 1 + src/ufo-forwardproject-task.c | 1 + src/ufo-gemm-task.c | 1 + src/ufo-general-backproject-task.c | 1 + src/ufo-get-dup-circ-task.c | 1 + src/ufo-gradient-task.c | 1 + src/ufo-horizontal-interpolate-task.c | 1 + src/ufo-ifft-task.c | 1 + src/ufo-interpolate-stream-task.c | 1 + src/ufo-interpolate-task.c | 1 + src/ufo-lamino-backproject-task.c | 2 +- src/ufo-loop-task.c | 1 + src/ufo-map-color-task.c | 1 + src/ufo-map-slice-task.c | 1 + src/ufo-mask-task.c | 1 + src/ufo-measure-sharpness-task.c | 1 + src/ufo-measure-task.c | 1 + src/ufo-median-filter-task.c | 1 + src/ufo-memory-in-task.c | 1 + src/ufo-memory-out-task.c | 1 + src/ufo-merge-task.c | 1 + src/ufo-metaballs-task.c | 1 + src/ufo-monitor-task.c | 1 + src/ufo-non-local-means-task.c | 1 + src/ufo-null-task.c | 1 + src/ufo-opencl-reduce-task.c | 1 + src/ufo-opencl-task.c | 1 + src/ufo-ordfilt-task.c | 1 + src/ufo-pad-task.c | 1 + src/ufo-polar-coordinates-task.c | 1 + src/ufo-power-spectrum-task.c | 1 + src/ufo-reduce-task.c | 1 + src/ufo-refeed-task.c | 1 + src/ufo-remove-circle-task.c | 1 + src/ufo-remove-outliers-task.c | 1 + src/ufo-replicate-task.c | 1 + src/ufo-rescale-task.c | 1 + src/ufo-retrieve-phase-task.c | 1 + src/ufo-ring-pattern-task.c | 1 + src/ufo-ringwriter-task.c | 1 + src/ufo-rotate-task.c | 1 + src/ufo-segment-task.c | 1 + src/ufo-sleep-task.c | 1 + src/ufo-slice-task.c | 1 + src/ufo-sliding-stack-task.c | 1 + src/ufo-stack-task.c | 1 + src/ufo-stamp-task.c | 1 + src/ufo-stdin-task.c | 1 + src/ufo-stitch-task.c | 1 + src/ufo-subtract-task.c | 1 + src/ufo-swap-quadrants-task.c | 1 + src/ufo-tile-task.c | 1 + src/ufo-transpose-projections-task.c | 1 + src/ufo-transpose-task.c | 1 + src/ufo-unsplit-task.c | 1 + src/ufo-volume-render-task.c | 1 + src/ufo-write-task.c | 2 +- src/ufo-zeropad-task.c | 1 + src/ufo-zmq-pub-task.c | 1 + src/ufo-zmq-sub-task.c | 1 + 109 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 contrib/config.h.in create mode 100644 contrib/config.h.meson.in diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 324cfeb..5566941 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -47,6 +47,7 @@ add_definitions("-std=c99 -Wall -fPIC") add_definitions(-DG_LOG_DOMAIN="Ufo") include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ${OPENCL_INCLUDE_DIRS} ${UFO_INCLUDE_DIRS}) @@ -59,6 +60,10 @@ set(ufofilter_LIBS ${UFO_LIBRARIES} ${OpenCL_LIBRARIES}) +set(CL_TARGET_OPENCL_VERSION "120") +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/config.h) + # build static auxiliary library first add_library(contrib_sxc_aux STATIC ${contrib_sxc_aux_SRCS}) diff --git a/contrib/config.h.in b/contrib/config.h.in new file mode 100644 index 0000000..98f75dc --- /dev/null +++ b/contrib/config.h.in @@ -0,0 +1 @@ +#define CL_TARGET_OPENCL_VERSION ${CL_TARGET_OPENCL_VERSION} diff --git a/contrib/config.h.meson.in b/contrib/config.h.meson.in new file mode 100644 index 0000000..a477269 --- /dev/null +++ b/contrib/config.h.meson.in @@ -0,0 +1 @@ +#mesondefine CL_TARGET_OPENCL_VERSION diff --git a/contrib/meson.build b/contrib/meson.build index 747d2be..80da0db 100644 --- a/contrib/meson.build +++ b/contrib/meson.build @@ -27,3 +27,11 @@ endforeach install_data(kernels, install_dir: kernel_install_dir, ) + +conf = configuration_data() +conf.set('CL_TARGET_OPENCL_VERSION', '120') +configure_file( + input: 'config.h.meson.in', + output: 'config.h', + configuration: conf, +) diff --git a/contrib/ufo-med-mad-reject-2d-task.c b/contrib/ufo-med-mad-reject-2d-task.c index 122a80f..2e2a34d 100644 --- a/contrib/ufo-med-mad-reject-2d-task.c +++ b/contrib/ufo-med-mad-reject-2d-task.c @@ -18,6 +18,7 @@ * * Serge Cohen */ +#include "config.h" #include diff --git a/contrib/ufo-med-mad-reject-task.c b/contrib/ufo-med-mad-reject-task.c index 14d03a4..5df5ed1 100644 --- a/contrib/ufo-med-mad-reject-task.c +++ b/contrib/ufo-med-mad-reject-task.c @@ -18,6 +18,7 @@ * * Serge Cohen */ +#include "config.h" #include "ufo-med-mad-reject-task.h" #include "ufo-sxc-common.h" diff --git a/contrib/ufo-ocl-1liner-task.c b/contrib/ufo-ocl-1liner-task.c index b0a0e4e..9c54403 100644 --- a/contrib/ufo-ocl-1liner-task.c +++ b/contrib/ufo-ocl-1liner-task.c @@ -18,6 +18,7 @@ * * Serge Cohen */ +#include "config.h" // The following define seems necessary on Linux to get stdio.h declare asprintf family of functions. // Should be done early enough to be sure that stdio.h is not already included withOUT _GNU_SOURCE on. #define _GNU_SOURCE diff --git a/contrib/ufo-stat-monitor-task.c b/contrib/ufo-stat-monitor-task.c index ab31c9b..3e52b33 100644 --- a/contrib/ufo-stat-monitor-task.c +++ b/contrib/ufo-stat-monitor-task.c @@ -18,6 +18,7 @@ * * Serge Cohen */ +#include "config.h" #include diff --git a/contrib/ufo-sxc-common.c b/contrib/ufo-sxc-common.c index a0c3d6f..4128174 100644 --- a/contrib/ufo-sxc-common.c +++ b/contrib/ufo-sxc-common.c @@ -19,6 +19,7 @@ * Serge Cohen */ +#include "config.h" #include "ufo-sxc-common.h" // Required headers : diff --git a/deps/oclfft/oclFFT.h b/deps/oclfft/oclFFT.h index f6049be..b9e968a 100644 --- a/deps/oclfft/oclFFT.h +++ b/deps/oclfft/oclFFT.h @@ -53,6 +53,7 @@ extern "C" { #endif +#define CL_TARGET_OPENCL_VERSION 120 #ifdef __APPLE__ #include #else diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1aca963..adea666 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -147,6 +147,7 @@ set(ufofilter_LIBS ${OpenCL_LIBRARIES}) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -Wall -Wextra -fPIC -Wno-unused-parameter -Wno-deprecated-declarations") +set(CL_TARGET_OPENCL_VERSION "120") add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES) #}}} diff --git a/src/common/ufo-common.c b/src/common/ufo-common.c index f157cf4..39086ee 100644 --- a/src/common/ufo-common.c +++ b/src/common/ufo-common.c @@ -16,7 +16,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ - #include #include #include "ufo-math.h" diff --git a/src/common/ufo-common.h b/src/common/ufo-common.h index f6e2349..82e7127 100644 --- a/src/common/ufo-common.h +++ b/src/common/ufo-common.h @@ -20,6 +20,7 @@ #ifndef UFO_COMMON_H #define UFO_COMMON_H +#include "config.h" #ifdef __APPLE__ #include #else diff --git a/src/config.h.in b/src/config.h.in index 4ba01e4..bdb6366 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -4,3 +4,4 @@ #cmakedefine HAVE_JPEG #cmakedefine WITH_HDF5 #define BURST ${BP_BURST} +#define CL_TARGET_OPENCL_VERSION ${CL_TARGET_OPENCL_VERSION} diff --git a/src/config.h.meson.in b/src/config.h.meson.in index efd7cd4..1f9a221 100644 --- a/src/config.h.meson.in +++ b/src/config.h.meson.in @@ -3,3 +3,4 @@ #mesondefine HAVE_JPEG #mesondefine WITH_HDF5 #mesondefine BURST +#mesondefine CL_TARGET_OPENCL_VERSION diff --git a/src/meson.build b/src/meson.build index dffac34..7676848 100644 --- a/src/meson.build +++ b/src/meson.build @@ -124,6 +124,7 @@ conf.set('HAVE_TIFF', tiff_dep.found()) conf.set('HAVE_JPEG', jpeg_dep.found()) conf.set('WITH_HDF5', hdf5_dep.found()) conf.set('BURST', get_option('lamino_backproject_burst_mode')) +conf.set('CL_TARGET_OPENCL_VERSION', '120') configure_file( input: 'config.h.meson.in', diff --git a/src/ufo-average-task.c b/src/ufo-average-task.c index 6e77ccb..ed2bde9 100644 --- a/src/ufo-average-task.c +++ b/src/ufo-average-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include diff --git a/src/ufo-backproject-task.c b/src/ufo-backproject-task.c index 74c3ab5..ca002ea 100644 --- a/src/ufo-backproject-task.c +++ b/src/ufo-backproject-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-bin-task.c b/src/ufo-bin-task.c index 1b7bc90..5f7a013 100644 --- a/src/ufo-bin-task.c +++ b/src/ufo-bin-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-binarize-task.c b/src/ufo-binarize-task.c index 94d652e..3b110de 100644 --- a/src/ufo-binarize-task.c +++ b/src/ufo-binarize-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-blur-task.c b/src/ufo-blur-task.c index c004de5..1704be0 100644 --- a/src/ufo-blur-task.c +++ b/src/ufo-blur-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-buffer-task.c b/src/ufo-buffer-task.c index 5a8801b..7d9f263 100644 --- a/src/ufo-buffer-task.c +++ b/src/ufo-buffer-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-buffer-task.h" diff --git a/src/ufo-calculate-task.c b/src/ufo-calculate-task.c index e42ae38..2b987ca 100644 --- a/src/ufo-calculate-task.c +++ b/src/ufo-calculate-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include #include diff --git a/src/ufo-camera-task.c b/src/ufo-camera-task.c index 1a155c3..19084ee 100644 --- a/src/ufo-camera-task.c +++ b/src/ufo-camera-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include diff --git a/src/ufo-center-of-rotation-task.c b/src/ufo-center-of-rotation-task.c index c66e234..9b1d3f1 100644 --- a/src/ufo-center-of-rotation-task.c +++ b/src/ufo-center-of-rotation-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include "ufo-center-of-rotation-task.h" diff --git a/src/ufo-clip-task.c b/src/ufo-clip-task.c index 56a0ddb..387f777 100644 --- a/src/ufo-clip-task.c +++ b/src/ufo-clip-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-concatenate-result-task.c b/src/ufo-concatenate-result-task.c index 5a80272..a53f9ca 100644 --- a/src/ufo-concatenate-result-task.c +++ b/src/ufo-concatenate-result-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include /* realloc */ #include /* memcpy */ diff --git a/src/ufo-cone-beam-projection-weight-task.c b/src/ufo-cone-beam-projection-weight-task.c index 87b7271..ec3c8dd 100644 --- a/src/ufo-cone-beam-projection-weight-task.c +++ b/src/ufo-cone-beam-projection-weight-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include diff --git a/src/ufo-contrast-task.c b/src/ufo-contrast-task.c index 6712845..67d60e0 100644 --- a/src/ufo-contrast-task.c +++ b/src/ufo-contrast-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include #include diff --git a/src/ufo-correlate-stacks-task.c b/src/ufo-correlate-stacks-task.c index 8a0af17..fa9b42d 100644 --- a/src/ufo-correlate-stacks-task.c +++ b/src/ufo-correlate-stacks-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-crop-task.c b/src/ufo-crop-task.c index 80d3a18..ed5ede2 100644 --- a/src/ufo-crop-task.c +++ b/src/ufo-crop-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-cut-sinogram-task.c b/src/ufo-cut-sinogram-task.c index 4eb02c9..3a41004 100644 --- a/src/ufo-cut-sinogram-task.c +++ b/src/ufo-cut-sinogram-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-cut-task.c b/src/ufo-cut-task.c index 1f8a91d..187defb 100644 --- a/src/ufo-cut-task.c +++ b/src/ufo-cut-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-denoise-task.c b/src/ufo-denoise-task.c index 4ebd1e1..2af68c9 100644 --- a/src/ufo-denoise-task.c +++ b/src/ufo-denoise-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-detect-edge-task.c b/src/ufo-detect-edge-task.c index 1eb402d..f524cfa 100644 --- a/src/ufo-detect-edge-task.c +++ b/src/ufo-detect-edge-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-dfi-sinc-task.c b/src/ufo-dfi-sinc-task.c index 3245a9c..a48ac4e 100644 --- a/src/ufo-dfi-sinc-task.c +++ b/src/ufo-dfi-sinc-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-dummy-data-task.c b/src/ufo-dummy-data-task.c index af6dd61..6739189 100644 --- a/src/ufo-dummy-data-task.c +++ b/src/ufo-dummy-data-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-dump-ring-task.c b/src/ufo-dump-ring-task.c index 27491ab..1ea7ea8 100644 --- a/src/ufo-dump-ring-task.c +++ b/src/ufo-dump-ring-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include diff --git a/src/ufo-duplicate-task.c b/src/ufo-duplicate-task.c index 5491362..c246e69 100644 --- a/src/ufo-duplicate-task.c +++ b/src/ufo-duplicate-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include #include "ufo-duplicate-task.h" diff --git a/src/ufo-fft-task.c b/src/ufo-fft-task.c index b8356a4..483945c 100644 --- a/src/ufo-fft-task.c +++ b/src/ufo-fft-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include diff --git a/src/ufo-fftmult-task.c b/src/ufo-fftmult-task.c index 5fd68a5..a0cd968 100644 --- a/src/ufo-fftmult-task.c +++ b/src/ufo-fftmult-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #ifdef __APPLE__ # include diff --git a/src/ufo-filter-particle-task.c b/src/ufo-filter-particle-task.c index 46d5ae5..6ae0bbc 100644 --- a/src/ufo-filter-particle-task.c +++ b/src/ufo-filter-particle-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include #include diff --git a/src/ufo-filter-stripes-task.c b/src/ufo-filter-stripes-task.c index 7b07c5d..bd56b7e 100644 --- a/src/ufo-filter-stripes-task.c +++ b/src/ufo-filter-stripes-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-filter-stripes1d-task.c b/src/ufo-filter-stripes1d-task.c index 16a9c9c..d55f964 100644 --- a/src/ufo-filter-stripes1d-task.c +++ b/src/ufo-filter-stripes1d-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-filter-task.c b/src/ufo-filter-task.c index b989b57..eab5c45 100644 --- a/src/ufo-filter-task.c +++ b/src/ufo-filter-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-find-large-spots-task.c b/src/ufo-find-large-spots-task.c index 86ecbb8..10c27d9 100644 --- a/src/ufo-find-large-spots-task.c +++ b/src/ufo-find-large-spots-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-flat-field-correct-task.c b/src/ufo-flat-field-correct-task.c index 4378bfc..4c9b948 100644 --- a/src/ufo-flat-field-correct-task.c +++ b/src/ufo-flat-field-correct-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-flatten-inplace-task.c b/src/ufo-flatten-inplace-task.c index 99da334..a40ef15 100644 --- a/src/ufo-flatten-inplace-task.c +++ b/src/ufo-flatten-inplace-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include "ufo-flatten-inplace-task.h" diff --git a/src/ufo-flatten-task.c b/src/ufo-flatten-task.c index c59e2be..3021876 100644 --- a/src/ufo-flatten-task.c +++ b/src/ufo-flatten-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-flatten-task.h" diff --git a/src/ufo-flip-task.c b/src/ufo-flip-task.c index 3586089..c663c9f 100644 --- a/src/ufo-flip-task.c +++ b/src/ufo-flip-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-forwardproject-task.c b/src/ufo-forwardproject-task.c index 6842810..2058614 100644 --- a/src/ufo-forwardproject-task.c +++ b/src/ufo-forwardproject-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-gemm-task.c b/src/ufo-gemm-task.c index eccbc0d..8adf50f 100644 --- a/src/ufo-gemm-task.c +++ b/src/ufo-gemm-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-general-backproject-task.c b/src/ufo-general-backproject-task.c index e63d841..3b7b365 100644 --- a/src/ufo-general-backproject-task.c +++ b/src/ufo-general-backproject-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include diff --git a/src/ufo-get-dup-circ-task.c b/src/ufo-get-dup-circ-task.c index d0cc4ee..4733916 100644 --- a/src/ufo-get-dup-circ-task.c +++ b/src/ufo-get-dup-circ-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include /* sqrt */ #include /* memcpy */ diff --git a/src/ufo-gradient-task.c b/src/ufo-gradient-task.c index 587c893..df73a00 100644 --- a/src/ufo-gradient-task.c +++ b/src/ufo-gradient-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-horizontal-interpolate-task.c b/src/ufo-horizontal-interpolate-task.c index d97d951..436018b 100644 --- a/src/ufo-horizontal-interpolate-task.c +++ b/src/ufo-horizontal-interpolate-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-ifft-task.c b/src/ufo-ifft-task.c index 38a3397..1cf5499 100644 --- a/src/ufo-ifft-task.c +++ b/src/ufo-ifft-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-interpolate-stream-task.c b/src/ufo-interpolate-stream-task.c index eefd4f7..7b8a22b 100644 --- a/src/ufo-interpolate-stream-task.c +++ b/src/ufo-interpolate-stream-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-interpolate-task.c b/src/ufo-interpolate-task.c index 2857b43..bfb8d31 100644 --- a/src/ufo-interpolate-task.c +++ b/src/ufo-interpolate-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-lamino-backproject-task.c b/src/ufo-lamino-backproject-task.c index 53d15a6..3a01add 100644 --- a/src/ufo-lamino-backproject-task.c +++ b/src/ufo-lamino-backproject-task.c @@ -17,6 +17,7 @@ * License along with this library. If not, see . */ +#include "config.h" #include #include #include @@ -28,7 +29,6 @@ #include #endif -#include "config.h" #include "ufo-lamino-backproject-task.h" #include "lamino-roi.h" #include "common/ufo-addressing.h" diff --git a/src/ufo-loop-task.c b/src/ufo-loop-task.c index 696942b..e0bc233 100644 --- a/src/ufo-loop-task.c +++ b/src/ufo-loop-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include "ufo-loop-task.h" diff --git a/src/ufo-map-color-task.c b/src/ufo-map-color-task.c index c807d94..84caf7a 100644 --- a/src/ufo-map-color-task.c +++ b/src/ufo-map-color-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-map-slice-task.c b/src/ufo-map-slice-task.c index 6b0df55..b48bf4a 100644 --- a/src/ufo-map-slice-task.c +++ b/src/ufo-map-slice-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include diff --git a/src/ufo-mask-task.c b/src/ufo-mask-task.c index 78ef646..297abe8 100644 --- a/src/ufo-mask-task.c +++ b/src/ufo-mask-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-measure-sharpness-task.c b/src/ufo-measure-sharpness-task.c index e1d47ba..4a1c7d6 100644 --- a/src/ufo-measure-sharpness-task.c +++ b/src/ufo-measure-sharpness-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-measure-sharpness-task.h" diff --git a/src/ufo-measure-task.c b/src/ufo-measure-task.c index a5f7712..d8ec8fc 100644 --- a/src/ufo-measure-task.c +++ b/src/ufo-measure-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include diff --git a/src/ufo-median-filter-task.c b/src/ufo-median-filter-task.c index afa2283..256b348 100644 --- a/src/ufo-median-filter-task.c +++ b/src/ufo-median-filter-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-memory-in-task.c b/src/ufo-memory-in-task.c index 6be47f3..fe9df17 100644 --- a/src/ufo-memory-in-task.c +++ b/src/ufo-memory-in-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include "ufo-memory-in-task.h" diff --git a/src/ufo-memory-out-task.c b/src/ufo-memory-out-task.c index e4ae9cf..628e2c1 100644 --- a/src/ufo-memory-out-task.c +++ b/src/ufo-memory-out-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-memory-out-task.h" diff --git a/src/ufo-merge-task.c b/src/ufo-merge-task.c index 34112c8..f383b3e 100644 --- a/src/ufo-merge-task.c +++ b/src/ufo-merge-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-metaballs-task.c b/src/ufo-metaballs-task.c index 6d4159d..cf4510e 100644 --- a/src/ufo-metaballs-task.c +++ b/src/ufo-metaballs-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-monitor-task.c b/src/ufo-monitor-task.c index 71b4cae..d9a8648 100644 --- a/src/ufo-monitor-task.c +++ b/src/ufo-monitor-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include "ufo-priv.h" #include "ufo-monitor-task.h" diff --git a/src/ufo-non-local-means-task.c b/src/ufo-non-local-means-task.c index d88948b..5920cc9 100644 --- a/src/ufo-non-local-means-task.c +++ b/src/ufo-non-local-means-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-null-task.c b/src/ufo-null-task.c index c12babc..832012d 100644 --- a/src/ufo-null-task.c +++ b/src/ufo-null-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-opencl-reduce-task.c b/src/ufo-opencl-reduce-task.c index 41f8463..47189fb 100644 --- a/src/ufo-opencl-reduce-task.c +++ b/src/ufo-opencl-reduce-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-opencl-task.c b/src/ufo-opencl-task.c index 1cd889e..3e78b21 100644 --- a/src/ufo-opencl-task.c +++ b/src/ufo-opencl-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-ordfilt-task.c b/src/ufo-ordfilt-task.c index fc1bed5..5978701 100644 --- a/src/ufo-ordfilt-task.c +++ b/src/ufo-ordfilt-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ # include diff --git a/src/ufo-pad-task.c b/src/ufo-pad-task.c index 187e1e1..f2b219f 100644 --- a/src/ufo-pad-task.c +++ b/src/ufo-pad-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include #else diff --git a/src/ufo-polar-coordinates-task.c b/src/ufo-polar-coordinates-task.c index 28aabe1..b29d8ae 100644 --- a/src/ufo-polar-coordinates-task.c +++ b/src/ufo-polar-coordinates-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-power-spectrum-task.c b/src/ufo-power-spectrum-task.c index 6b86f1a..9033049 100644 --- a/src/ufo-power-spectrum-task.c +++ b/src/ufo-power-spectrum-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-reduce-task.c b/src/ufo-reduce-task.c index 54f64a0..2875922 100644 --- a/src/ufo-reduce-task.c +++ b/src/ufo-reduce-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-refeed-task.c b/src/ufo-refeed-task.c index 936b236..441015c 100644 --- a/src/ufo-refeed-task.c +++ b/src/ufo-refeed-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include "ufo-refeed-task.h" diff --git a/src/ufo-remove-circle-task.c b/src/ufo-remove-circle-task.c index 113d1ca..731a18b 100644 --- a/src/ufo-remove-circle-task.c +++ b/src/ufo-remove-circle-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include #include "ufo-remove-circle-task.h" diff --git a/src/ufo-remove-outliers-task.c b/src/ufo-remove-outliers-task.c index 00c6aa8..98bf2f8 100644 --- a/src/ufo-remove-outliers-task.c +++ b/src/ufo-remove-outliers-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-replicate-task.c b/src/ufo-replicate-task.c index c9946d7..88f973b 100644 --- a/src/ufo-replicate-task.c +++ b/src/ufo-replicate-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include #include "ufo-replicate-task.h" diff --git a/src/ufo-rescale-task.c b/src/ufo-rescale-task.c index bdc57ba..3cac727 100644 --- a/src/ufo-rescale-task.c +++ b/src/ufo-rescale-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-retrieve-phase-task.c b/src/ufo-retrieve-phase-task.c index 01e690f..2e98b3d 100644 --- a/src/ufo-retrieve-phase-task.c +++ b/src/ufo-retrieve-phase-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-ring-pattern-task.c b/src/ufo-ring-pattern-task.c index b8dcb54..6bbfcac 100644 --- a/src/ufo-ring-pattern-task.c +++ b/src/ufo-ring-pattern-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include #include diff --git a/src/ufo-ringwriter-task.c b/src/ufo-ringwriter-task.c index a9e4427..da1b370 100644 --- a/src/ufo-ringwriter-task.c +++ b/src/ufo-ringwriter-task.c @@ -18,6 +18,7 @@ * * Authored by: Alexandre Lewkowicz (lewkow_a@epita.fr) */ +#include "config.h" #include #include diff --git a/src/ufo-rotate-task.c b/src/ufo-rotate-task.c index 535e26a..f8fc5b5 100644 --- a/src/ufo-rotate-task.c +++ b/src/ufo-rotate-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include diff --git a/src/ufo-segment-task.c b/src/ufo-segment-task.c index a110cde..0292e20 100644 --- a/src/ufo-segment-task.c +++ b/src/ufo-segment-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-sleep-task.c b/src/ufo-sleep-task.c index 7c09074..2581509 100644 --- a/src/ufo-sleep-task.c +++ b/src/ufo-sleep-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-slice-task.c b/src/ufo-slice-task.c index 0fc14fe..ef0ddac 100644 --- a/src/ufo-slice-task.c +++ b/src/ufo-slice-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-slice-task.h" diff --git a/src/ufo-sliding-stack-task.c b/src/ufo-sliding-stack-task.c index dbc2d75..671d316 100644 --- a/src/ufo-sliding-stack-task.c +++ b/src/ufo-sliding-stack-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-sliding-stack-task.h" diff --git a/src/ufo-stack-task.c b/src/ufo-stack-task.c index 9270637..b8a5446 100644 --- a/src/ufo-stack-task.c +++ b/src/ufo-stack-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-stack-task.h" diff --git a/src/ufo-stamp-task.c b/src/ufo-stamp-task.c index 11ea90f..e419ae6 100644 --- a/src/ufo-stamp-task.c +++ b/src/ufo-stamp-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-stamp-task.h" diff --git a/src/ufo-stdin-task.c b/src/ufo-stdin-task.c index c0d3a4e..3b3bdd1 100644 --- a/src/ufo-stdin-task.c +++ b/src/ufo-stdin-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #include "ufo-stdin-task.h" diff --git a/src/ufo-stitch-task.c b/src/ufo-stitch-task.c index d6fb9e9..dae4507 100644 --- a/src/ufo-stitch-task.c +++ b/src/ufo-stitch-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #include #ifdef __APPLE__ diff --git a/src/ufo-subtract-task.c b/src/ufo-subtract-task.c index a85a2db..8873b77 100644 --- a/src/ufo-subtract-task.c +++ b/src/ufo-subtract-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-swap-quadrants-task.c b/src/ufo-swap-quadrants-task.c index 7d2ab30..9bb7a9e 100644 --- a/src/ufo-swap-quadrants-task.c +++ b/src/ufo-swap-quadrants-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-tile-task.c b/src/ufo-tile-task.c index 1f3cfe5..c53f77d 100644 --- a/src/ufo-tile-task.c +++ b/src/ufo-tile-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-transpose-projections-task.c b/src/ufo-transpose-projections-task.c index c4780ae..8cd0e7a 100644 --- a/src/ufo-transpose-projections-task.c +++ b/src/ufo-transpose-projections-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-transpose-task.c b/src/ufo-transpose-task.c index ee1b9ee..0857b36 100644 --- a/src/ufo-transpose-task.c +++ b/src/ufo-transpose-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include #else diff --git a/src/ufo-unsplit-task.c b/src/ufo-unsplit-task.c index 05d7717..e2fdb1b 100644 --- a/src/ufo-unsplit-task.c +++ b/src/ufo-unsplit-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-volume-render-task.c b/src/ufo-volume-render-task.c index a0698bb..e7c61be 100644 --- a/src/ufo-volume-render-task.c +++ b/src/ufo-volume-render-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-write-task.c b/src/ufo-write-task.c index 0f1e478..c97410d 100644 --- a/src/ufo-write-task.c +++ b/src/ufo-write-task.c @@ -17,6 +17,7 @@ * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include #else @@ -29,7 +30,6 @@ #include #include -#include "config.h" #include "ufo-write-task.h" #include "writers/ufo-writer.h" #include "writers/ufo-raw-writer.h" diff --git a/src/ufo-zeropad-task.c b/src/ufo-zeropad-task.c index ea823dc..ffa502a 100644 --- a/src/ufo-zeropad-task.c +++ b/src/ufo-zeropad-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-zmq-pub-task.c b/src/ufo-zmq-pub-task.c index 8b11a02..fe9704c 100644 --- a/src/ufo-zmq-pub-task.c +++ b/src/ufo-zmq-pub-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include diff --git a/src/ufo-zmq-sub-task.c b/src/ufo-zmq-sub-task.c index 5c8f7e5..c87a421 100644 --- a/src/ufo-zmq-sub-task.c +++ b/src/ufo-zmq-sub-task.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . */ +#include "config.h" #ifdef __APPLE__ #include -- cgit v1.2.1