potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #28015 from bebuch:fix-msvc-vs-2026

Browse Source 
add MSVC 19.50 / VS 2026 / VC 18 to config: fix #28013
This commit is contained in:
Alexander Smorkalov
2025-11-16 19:25:03 +03:00
committed by GitHub
parent 42cf71285e 91a720144b
commit 5bec733bfb
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVDetectCXXCompiler.cmake
+2
View File
@@ -184,6 +184,8 @@ elseif(MSVC)
set(OpenCV_RUNTIME vc16)
elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
set(OpenCV_RUNTIME vc17)
elseif(MSVC_VERSION MATCHES "^195[0-9]$")
set(OpenCV_RUNTIME vc18)
else()
message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
endif()
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
+27 -9
View File
@@ -141,15 +141,33 @@ elseif(MSVC)
set(OpenCV_RUNTIME vc17)
check_one_config(has_VS2022)
if(NOT has_VS2022)
set(OpenCV_RUNTIME vc16)
check_one_config(has_VS2019)
if(NOT has_VS2019)
set(OpenCV_RUNTIME vc15) # selecting previous compatible runtime version
check_one_config(has_VS2017)
if(NOT has_VS2017)
set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
endif()
endif()
set(OpenCV_RUNTIME vc16) # selecting previous compatible runtime version
check_one_config(has_VS2019)
if(NOT has_VS2019)
set(OpenCV_RUNTIME vc15) # selecting previous compatible runtime version
check_one_config(has_VS2017)
if(NOT has_VS2017)
set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
endif()
endif()
endif()
elseif(MSVC_VERSION MATCHES "^195[0-9]$")
set(OpenCV_RUNTIME vc18)
check_one_config(has_VS2026)
if(NOT has_VS2026)
set(OpenCV_RUNTIME vc17) # selecting previous compatible runtime version
check_one_config(has_VS2022)
if(NOT has_VS2022)
set(OpenCV_RUNTIME vc16) # selecting previous compatible runtime version
check_one_config(has_VS2019)
if(NOT has_VS2019)
set(OpenCV_RUNTIME vc15) # selecting previous compatible runtime version
check_one_config(has_VS2017)
if(NOT has_VS2017)
set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
endif()
endif()
endif()
endif()
endif()
elseif(MINGW)