diff --git a/CMakeExternals/OpenCV.patch b/CMakeExternals/OpenCV.patch
index 371019db71..c2f5733d0d 100644
--- a/CMakeExternals/OpenCV.patch
+++ b/CMakeExternals/OpenCV.patch
@@ -1,31 +1,53 @@
---- OpenCV-2.4.11/cmake/OpenCVModule.cmake	2015-02-25 13:10:31.000000000 +0100
-+++ opencv/cmake/OpenCVModule.cmake	2015-03-06 13:05:45.000000000 +0100
-@@ -521,7 +521,7 @@
+--- a/cmake/OpenCVModule.cmake
++++ b/cmake/OpenCVModule.cmake
+@@ -525,7 +525,7 @@
      ocv_include_directories(${OPENCL_INCLUDE_DIRS})
      add_custom_command(
        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp"
 -      COMMAND ${CMAKE_COMMAND} -DCL_DIR="${CMAKE_CURRENT_SOURCE_DIR}/src/opencl" -DOUTPUT="${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" -P "${OpenCV_SOURCE_DIR}/cmake/cl2cpp.cmake"
 +      COMMAND ${CMAKE_COMMAND} -DCL_DIR=${CMAKE_CURRENT_SOURCE_DIR}/src/opencl -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp -P ${OpenCV_SOURCE_DIR}/cmake/cl2cpp.cmake
        DEPENDS ${cl_kernels} "${OpenCV_SOURCE_DIR}/cmake/cl2cpp.cmake")
      source_group("OpenCL" FILES ${cl_kernels} "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp")
      list(APPEND lib_srcs ${cl_kernels} "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp")
---- OpenCV-2.4.11/cmake/templates/OpenCVConfig.cmake.in	2015-02-25 13:10:31.000000000 +0100
-+++ opencv/cmake/templates/OpenCVConfig.cmake.in	2015-03-06 13:08:56.000000000 +0100
+--- a/cmake/templates/OpenCVConfig.cmake.in
++++ b/cmake/templates/OpenCVConfig.cmake.in
 @@ -120,7 +120,7 @@
 
  # Provide the include directories to the caller
  set(OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@)
 -include_directories(${OpenCV_INCLUDE_DIRS})
 +# include_directories(${OpenCV_INCLUDE_DIRS})
 
  # ======================================================
  # Link directories to add to the user project:
 @@ -153,7 +153,7 @@
  # ==============================================================
  SET(OpenCV2_INCLUDE_DIRS @OpenCV2_INCLUDE_DIRS_CONFIGCMAKE@)
  if(OpenCV2_INCLUDE_DIRS)
 -  include_directories(${OpenCV2_INCLUDE_DIRS})
 +  # include_directories(${OpenCV2_INCLUDE_DIRS})
    list(APPEND OpenCV_INCLUDE_DIRS ${OpenCV2_INCLUDE_DIRS})
 
    set(OpenCV_ADD_DEBUG_RELEASE @OpenCV_ADD_DEBUG_RELEASE_CONFIGCMAKE@)
+--- a/cmake/OpenCVConfig.cmake
++++ b/cmake/OpenCVConfig.cmake
+@@ -81,7 +81,7 @@
+     set(OpenCV_RUNTIME vc12)
+   elseif(MSVC_VERSION EQUAL 1900)
+     set(OpenCV_RUNTIME vc14)
+-  elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
++  elseif(MSVC_VERSION MATCHES "^191[0-9]$")
+     set(OpenCV_RUNTIME vc15)
+   endif()
+ elseif(MINGW)
+--- a/cmake/OpenCVDetectCXXCompiler.cmake
++++ b/cmake/OpenCVDetectCXXCompiler.cmake
+@@ -100,7 +100,7 @@
+     set(OpenCV_RUNTIME vc12)
+   elseif(MSVC_VERSION EQUAL 1900)
+     set(OpenCV_RUNTIME vc14)
+-  elseif(MSVC_VERSION EQUAL 1910 OR MSVC_VERSION EQUAL 1911)
++  elseif(MSVC_VERSION MATCHES "^191[0-9]$")
+     set(OpenCV_RUNTIME vc15)
+   endif()
+ elseif(MINGW)