Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-11-09 18:04:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

add MSVC 19.50 / VS 2026 / VC 18 to config: fix #28013

Browse Source
This commit is contained in:
Benjamin Buch
2025-11-14 15:44:58 +01:00
parent 1abc90c178
commit 91a720144b
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVDetectCXXCompiler.cmake
View File

@@ -184,6 +184,8 @@ elseif(MSVC)
set(OpenCV_RUNTIME vc16) set(OpenCV_RUNTIME vc16)
elseif(MSVC_VERSION MATCHES "^19[34][0-9]$") elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
set(OpenCV_RUNTIME vc17) set(OpenCV_RUNTIME vc17)
elseif(MSVC_VERSION MATCHES "^195[0-9]$")
set(OpenCV_RUNTIME vc18)
else() else()
message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME") message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
endif() endif()

36
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
View File

@@ -141,15 +141,33 @@ elseif(MSVC)
set(OpenCV_RUNTIME vc17) set(OpenCV_RUNTIME vc17)
check_one_config(has_VS2022) check_one_config(has_VS2022)
if(NOT has_VS2022) if(NOT has_VS2022)
set(OpenCV_RUNTIME vc16) set(OpenCV_RUNTIME vc16) # selecting previous compatible runtime version
check_one_config(has_VS2019) check_one_config(has_VS2019)
if(NOT has_VS2019) if(NOT has_VS2019)
set(OpenCV_RUNTIME vc15) # selecting previous compatible runtime version set(OpenCV_RUNTIME vc15) # selecting previous compatible runtime version
check_one_config(has_VS2017) check_one_config(has_VS2017)
if(NOT has_VS2017) if(NOT has_VS2017)
set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
endif() endif()
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()
endif() endif()
elseif(MINGW) elseif(MINGW)