mirror of
https://github.com/nihui/opencv-mobile.git
synced 2025-09-27 04:46:17 +08:00
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
diff -Nuarp opencv-3.4.20.orig/cmake/OpenCVDetectCXXCompiler.cmake opencv-3.4.20/cmake/OpenCVDetectCXXCompiler.cmake
|
|
--- opencv-3.4.20.orig/cmake/OpenCVDetectCXXCompiler.cmake 2023-06-27 19:29:13.000000000 +0800
|
|
+++ opencv-3.4.20/cmake/OpenCVDetectCXXCompiler.cmake 2024-06-10 14:47:05.286016469 +0800
|
|
@@ -169,7 +169,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")
|
|
diff -Nuarp opencv-3.4.20.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in opencv-3.4.20/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
|
|
--- opencv-3.4.20.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2023-06-27 19:29:13.000000000 +0800
|
|
+++ opencv-3.4.20/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2024-06-10 14:46:17.345712729 +0800
|
|
@@ -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)
|