52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From 6fb3f6333150a777e835fc7c48e49750591bf7fe Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Buch <bebuch@users.noreply.github.com>
|
|
Date: Thu, 23 May 2024 16:05:19 +0200
|
|
Subject: [PATCH] Support VS 2022 17.1x.y
|
|
|
|
With 17.10.0 the MSVC toolset was set to 19.40.x which breaks the compatibility test in the OpenCV's CMake Config files.
|
|
---
|
|
cmake/templates/OpenCVConfig.root-WIN32.cmake.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
|
|
index b0f254ebe8..62e36272f3 100644
|
|
--- a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
|
|
+++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
|
|
@@ -137,7 +137,7 @@ elseif(MSVC)
|
|
set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
|
|
endif()
|
|
endif()
|
|
- elseif(MSVC_VERSION MATCHES "^193[0-9]$")
|
|
+ elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
|
|
set(OpenCV_RUNTIME vc17)
|
|
check_one_config(has_VS2022)
|
|
if(NOT has_VS2022)
|
|
--
|
|
2.45.2.windows.1
|
|
|
|
From f85818ba6f9031c450475a7453dee0acce31a881 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Buch <bebuch@users.noreply.github.com>
|
|
Date: Fri, 24 May 2024 11:10:09 +0200
|
|
Subject: [PATCH] Support VS 2022 17.1x.y in OpenCVDetectCXXCompiler.cmake
|
|
|
|
With 17.10.0 the MSVC toolset was set to 19.40.x which breaks the compatibility test in the OpenCV's CMake Config files.
|
|
---
|
|
cmake/OpenCVDetectCXXCompiler.cmake | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
|
|
index 1743aca11f..448afd46ea 100644
|
|
--- a/cmake/OpenCVDetectCXXCompiler.cmake
|
|
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
|
|
@@ -176,7 +176,7 @@ elseif(MSVC)
|
|
set(OpenCV_RUNTIME vc15)
|
|
elseif(MSVC_VERSION MATCHES "^192[0-9]$")
|
|
set(OpenCV_RUNTIME vc16)
|
|
- elseif(MSVC_VERSION MATCHES "^193[0-9]$")
|
|
+ elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
|
|
set(OpenCV_RUNTIME vc17)
|
|
else()
|
|
message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
|
|
--
|
|
2.45.2.windows.1
|
|
|