Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cmake/configs/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ hunter_default_version(OpenBLAS VERSION 0.3.27)
hunter_default_version(OpenCL VERSION 2022.01.04-p1)
hunter_default_version(OpenCL-Headers VERSION 2022.01.04)
hunter_default_version(OpenCL-cpp VERSION 2.0.16-61a5c9a-p0)
hunter_default_version(OpenCV VERSION 4.10.0-p0)
hunter_default_version(OpenCV-Extra VERSION 4.10.0)
hunter_default_version(OpenCV VERSION 4.12.0-p0)
hunter_default_version(OpenCV-Extra VERSION 4.12.0)
hunter_default_version(OpenEXR VERSION 3.4.0-p0)
hunter_default_version(OpenGL-Registry VERSION 0.0.0-d15191e-p0)
hunter_default_version(OpenJPH VERSION 0.23.0)
Expand Down Expand Up @@ -336,11 +336,12 @@ hunter_default_version(intltool VERSION 0.51.0)
hunter_default_version(intsizeof VERSION 2.0.2)
hunter_default_version(intx VERSION 0.9.0)
hunter_default_version(ios_sim VERSION 3.1.1)
if(MSVC)
if(APPLE)
# still using OpenCV 4.10.0 ippicv version
hunter_default_version(ippicv VERSION 20240201)
else()
# see OpenCV for more info
hunter_default_version(ippicv VERSION 20230330)
hunter_default_version(ippicv VERSION 20250130)
endif()
hunter_default_version(iroha-ed25519 VERSION 2.0.0)
hunter_default_version(irrXML VERSION 1.2-p0)
Expand Down
11 changes: 11 additions & 0 deletions cmake/projects/OpenCV-Extra/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@ hunter_add_version(
164afbd29e2ac741b1159e572d6f13abd66b6064
)

hunter_add_version(
PACKAGE_NAME
OpenCV-Extra
VERSION
"4.12.0"
URL
"https://github.com/opencv/opencv_contrib/archive/4.12.0.tar.gz"
SHA1
2bcf20557c5019119c2307cb879e47b09bd1a4e5
)


hunter_pick_scheme(DEFAULT url_sha1_unpack)
hunter_download(PACKAGE_NAME OpenCV-Extra)
12 changes: 12 additions & 0 deletions cmake/projects/OpenCV/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,17 @@ hunter_add_version(
a0c2d5944364fc4f26b6160b33c03082b1fa08c1
)

hunter_add_version(
PACKAGE_NAME
OpenCV
VERSION
"4.12.0-p0"
URL
"https://github.com/cpp-pm/opencv/archive/refs/tags/v4.12.0-p0.tar.gz"
SHA1
ad56c2f05c31767b1a665e7f69e61bbd2adadec1
)

if(ANDROID)
# This feature doesn't work with new CMake 3.7+ toolchains
set(_android_args ENABLE_PRECOMPILED_HEADERS=OFF)
Expand Down Expand Up @@ -552,6 +563,7 @@ hunter_cmake_args(
WITH_QUIRC=OFF
WITH_LAPACK=OFF
WITH_PROTOBUF=OFF
WITH_VTK=OFF
)

# Pick a download scheme
Expand Down
25 changes: 25 additions & 0 deletions cmake/projects/ippicv/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,31 @@ elseif(WIN32)
)
endif()

# Version: 20250130
# added for OpenCV 4.12.0
if(UNIX)
hunter_add_version(
PACKAGE_NAME
ippicv
VERSION
"20250130"
URL
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/767426b2a40a011eb2fa7f44c677c13e60e205ad/ippicv/ippicv_2022.1.0_lnx_intel64_20250130_general.tgz"
SHA1
b1465c256d32112c69e1104f734edc0b1d68d0db
)
elseif(WIN32)
hunter_add_version(
PACKAGE_NAME
ippicv
VERSION
"20250130"
URL
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/767426b2a40a011eb2fa7f44c677c13e60e205ad/ippicv/ippicv_2022.1.0_win_intel64_20250130_general.zip"
SHA1
3c981e7bcd6fe586caba5915d4aa66f08e1db75e
)
endif()

hunter_pick_scheme(DEFAULT url_sha1_download)
hunter_download(PACKAGE_NAME ippicv)
Loading