Skip to content

O
opencv
Commit 8ee1be7d authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

cmake: support MSVS 2019

parent 45c4d3a6
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 8ee1be7d
...@@ -143,6 +143,8 @@ elseif(MSVC) ...@@ -143,6 +143,8 @@ elseif(MSVC)
set(OpenCV_RUNTIME vc14) set(OpenCV_RUNTIME vc14)
elseif(MSVC_VERSION MATCHES "^191[0-9]$") elseif(MSVC_VERSION MATCHES "^191[0-9]$")
set(OpenCV_RUNTIME vc15) set(OpenCV_RUNTIME vc15)
elseif(MSVC_VERSION MATCHES "^192[0-9]$")
set(OpenCV_RUNTIME vc16)
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()
......
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
View file @ 8ee1be7d
...@@ -113,6 +113,16 @@ elseif(MSVC) ...@@ -113,6 +113,16 @@ elseif(MSVC)
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()
elseif(MSVC_VERSION MATCHES "^192[0-9]$")
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()
endif() endif()
elseif(MINGW) elseif(MINGW)
set(OpenCV_RUNTIME mingw) set(OpenCV_RUNTIME mingw)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment