From fbc91c5ee93198c3cbc3174a4ddc75960bcd2b2f Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 21 Nov 2013 12:35:37 +0400 Subject: [PATCH 1/2] ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32) --- 3rdparty/include/opencl/1.2/CL/cl_platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/include/opencl/1.2/CL/cl_platform.h b/3rdparty/include/opencl/1.2/CL/cl_platform.h index cf2b7210ac..46b3d9dcdc 100644 --- a/3rdparty/include/opencl/1.2/CL/cl_platform.h +++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h @@ -92,7 +92,7 @@ extern "C" { #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated)) #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED #endif - #elif _WIN32 + #elif defined(_WIN32) #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED From ddc9be9170c7d0c3e3ccc43c69f5663bfd2d05c0 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 22 Nov 2013 18:24:50 +0400 Subject: [PATCH 2/2] ocl: don't disable Undef warnings --- modules/ocl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocl/CMakeLists.txt b/modules/ocl/CMakeLists.txt index a35aea0e2d..21e0b30858 100644 --- a/modules/ocl/CMakeLists.txt +++ b/modules/ocl/CMakeLists.txt @@ -5,4 +5,4 @@ endif() set(the_description "OpenCL-accelerated Computer Vision") ocv_define_module(ocl opencv_core opencv_imgproc opencv_features2d opencv_objdetect opencv_video opencv_calib3d opencv_ml "${OPENCL_LIBRARIES}") -ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wundef) +ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)