Fixing buildbot job:

- explicitly turning OCL off since WinRT does not support it
 - fixing macro definitions in core/ocl.cpp

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
pull/3700/head
Maxim Kostin 10 years ago
parent 213a6bc5c4
commit 22a30af353
  1. 9
      cmake/OpenCVDetectOpenCL.cmake
  2. 2
      modules/core/src/ocl.cpp

@ -10,6 +10,11 @@ else(APPLE)
set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2")
endif(APPLE)
if(WINRT)
set(OPENCL_FOUND NO)
set(HAVE_OPENCL_STATIC OFF)
endif(WINRT)
if(OPENCL_FOUND)
if(NOT HAVE_OPENCL_STATIC)
try_compile(__VALID_OPENCL
@ -24,7 +29,9 @@ if(OPENCL_FOUND)
endif()
endif()
set(HAVE_OPENCL 1)
if(NOT WINRT)
set(HAVE_OPENCL 1)
endif()
if(WITH_OPENCL_SVM)
set(HAVE_OPENCL_SVM 1)

@ -2198,7 +2198,6 @@ inline cl_int getStringInfo(Functor f, ObjectType obj, cl_uint name, std::string
return CL_SUCCESS;
}
#ifdef HAVE_OPENCL
static void split(const std::string &s, char delim, std::vector<std::string> &elems)
{
elems.clear();
@ -2239,7 +2238,6 @@ static bool parseOpenCLDeviceConfiguration(const std::string& configurationStr,
}
return true;
}
#endif
#ifdef WINRT
static cl_device_id selectOpenCLDevice()

Loading…
Cancel
Save