From 6686559c7086b5267945753a3c04aa560110da7b Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 26 Mar 2019 13:11:53 +0300 Subject: [PATCH] ocl: define CL_SILENCE_DEPRECATION on MacOSX --- .../opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp | 1 + .../src/opencl/runtime/generator/template/opencl_core.hpp.in | 1 + modules/core/src/opencl/runtime/opencl_core.cpp | 1 + samples/opencl/opencl-opencv-interop.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp index fdaf469ff1..28618a1f3a 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp @@ -96,6 +96,7 @@ #define clWaitForEvents clWaitForEvents_ #if defined __APPLE__ +#define CL_SILENCE_DEPRECATION #include #else #include diff --git a/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in b/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in index e04fb0b883..a2b5296ff2 100644 --- a/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in +++ b/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in @@ -5,6 +5,7 @@ @CL_REMAP_ORIGIN@ #if defined __APPLE__ +#define CL_SILENCE_DEPRECATION #include #else #include diff --git a/modules/core/src/opencl/runtime/opencl_core.cpp b/modules/core/src/opencl/runtime/opencl_core.cpp index 1d761390cc..9885e4d647 100644 --- a/modules/core/src/opencl/runtime/opencl_core.cpp +++ b/modules/core/src/opencl/runtime/opencl_core.cpp @@ -47,6 +47,7 @@ #if defined(HAVE_OPENCL_STATIC) #if defined __APPLE__ +#define CL_SILENCE_DEPRECATION #include #else #include diff --git a/samples/opencl/opencl-opencv-interop.cpp b/samples/opencl/opencl-opencv-interop.cpp index 816550feaf..d3b15668a9 100644 --- a/samples/opencl/opencl-opencv-interop.cpp +++ b/samples/opencl/opencl-opencv-interop.cpp @@ -19,6 +19,7 @@ #define CL_USE_DEPRECATED_OPENCL_2_0_APIS // eliminate build warning #ifdef __APPLE__ +#define CL_SILENCE_DEPRECATION #include #else #include