Skip to content

Commit

Permalink
Merge pull request #25 from srcejon/opencv_4_10_0
Browse files Browse the repository at this point in the history
Update to OpenCV 4.10.0
  • Loading branch information
f4exb authored Sep 12, 2024
2 parents c55d398 + f6eae86 commit e7d41fe
Show file tree
Hide file tree
Showing 342 changed files with 77,705 additions and 21,070 deletions.
2 changes: 1 addition & 1 deletion opencv4/OpenCVConfig-version.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(OpenCV_VERSION 4.5.0)
set(OpenCV_VERSION 4.10.0)
set(PACKAGE_VERSION ${OpenCV_VERSION})

set(PACKAGE_VERSION_EXACT False)
Expand Down
18 changes: 16 additions & 2 deletions opencv4/OpenCVConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
# - OpenCV_LIBS : The list of libraries to link against.
# - OpenCV_INCLUDE_DIRS : The OpenCV include directories.
# - OpenCV_COMPUTE_CAPABILITIES : The version of compute capability
# - OpenCV_VERSION : The version of this OpenCV build: "4.5.0"
# - OpenCV_VERSION : The version of this OpenCV build: "4.10.0"
# - OpenCV_VERSION_MAJOR : Major version part of OpenCV_VERSION: "4"
# - OpenCV_VERSION_MINOR : Minor version part of OpenCV_VERSION: "5"
# - OpenCV_VERSION_MINOR : Minor version part of OpenCV_VERSION: "10"
# - OpenCV_VERSION_PATCH : Patch version part of OpenCV_VERSION: "0"
# - OpenCV_VERSION_STATUS : Development status of this build: ""
#
Expand Down Expand Up @@ -137,6 +137,20 @@ elseif(MSVC)
set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
endif()
endif()
elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
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()
endif()
endif()
elseif(MINGW)
set(OpenCV_RUNTIME mingw)
Expand Down
Loading

0 comments on commit e7d41fe

Please sign in to comment.