From 6f29af625bb4617e2e061f8097b5f3e2ed341a82 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com> Date: Mon, 8 Jun 2026 17:03:23 +0300 Subject: [PATCH] Merge pull request #29268 from asmorkalov:as/disable_ocl_imterop_sample_4.x Disable OpenCV-OpenCL interop sample for now 4.x --- samples/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index dabe07747f..c94ac8e62b 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -25,7 +25,10 @@ add_subdirectory(java/tutorial_code) add_subdirectory(dnn) add_subdirectory(gpu) add_subdirectory(tapi) -add_subdirectory(opencl) +# HACK: CMake 4.x finds and links wrong OpenCL in 32-bit builds on Windows x64 +if(NOT (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)) + add_subdirectory(opencl) +endif() add_subdirectory(sycl) if(WIN32 AND HAVE_DIRECTX) add_subdirectory(directx) @@ -128,7 +131,10 @@ if(WIN32) endif() add_subdirectory(dnn) # add_subdirectory(gpu) -add_subdirectory(opencl) +# HACK: CMake 4.x finds and links wrong OpenCL in 32-bit builds on Windows x64 +if(NOT (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)) + add_subdirectory(opencl) +endif() add_subdirectory(sycl) # add_subdirectory(opengl) # add_subdirectory(openvx)