mirror of https://github.com/microsoft/vcpkg.git
[opencv4] [dnn](arm64) depends on [intrinsics] (#48467)
This commit is contained in:
parent
da93ad9cab
commit
0964f387bc
|
|
@ -40,6 +40,10 @@ file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
|
|||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
set(TARGET_IS_AARCH64 1)
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
# cf. https://github.com/opencv/opencv/issues/25052, https://github.com/opencv/opencv/pull/27897
|
||||
list(APPEND ADDITIONAL_BUILD_FLAGS -DHAVE_CPU_NEON_FP16_SUPPORT=0 -DHAVE_CPU_NEON_DOTPROD_SUPPORT=0)
|
||||
endif()
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
||||
set(TARGET_IS_ARM 1)
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "opencv4",
|
||||
"version": "4.11.0",
|
||||
"port-version": 7,
|
||||
"port-version": 8,
|
||||
"description": "computer vision library",
|
||||
"homepage": "https://github.com/opencv/opencv",
|
||||
"license": "Apache-2.0",
|
||||
|
|
@ -152,6 +152,14 @@
|
|||
"host": true,
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"intrinsics"
|
||||
],
|
||||
"platform": "arm64"
|
||||
},
|
||||
"protobuf"
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1199,7 +1199,6 @@ opencv4[cudnn](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64
|
|||
opencv4[dc1394](windows) = cascade
|
||||
opencv4[dnn-cuda](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)) | !((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade
|
||||
opencv4[dnn-cuda](osx) = cascade
|
||||
opencv4[dnn,halide](osx) = combination-fails
|
||||
opencv4[freetype](uwp) = cascade
|
||||
opencv4[gdcm](uwp) = cascade
|
||||
opencv4[gstreamer](uwp | xbox) = cascade
|
||||
|
|
@ -1207,7 +1206,6 @@ opencv4[halide](android | (windows & staticcrt) | uwp | (arm & windows))=cascade
|
|||
opencv4[opencl](uwp) = cascade
|
||||
opencv4[openexr](uwp) = cascade
|
||||
opencv4[opengl](uwp | xbox) = cascade
|
||||
opencv4[openvino](windows & arm) = cascade
|
||||
opencv4[qt](uwp | ios | xbox) = cascade
|
||||
opencv4[sfm](uwp) = cascade
|
||||
opencv4[tbb](uwp) = cascade
|
||||
|
|
@ -1852,19 +1850,14 @@ opencv3[opengl](android) = feature-fails
|
|||
opencv3[opengl](linux | osx) = no-separate-feature-test # needs gui (gtk | qt)
|
||||
opencv3[sfm](android) = feature-fails
|
||||
opencv4[core,cuda,world](windows)=options
|
||||
opencv4[dnn]:arm64-osx=feature-fails
|
||||
opencv4[dnn](arm & windows & !uwp) = feature-fails
|
||||
opencv4[dshow](!windows | uwp)=feature-fails
|
||||
opencv4[halide](!android & !(windows & staticcrt) & !uwp & !(arm & windows))=feature-fails # error C2039: 'attachHalide': is not a member of 'cv::dnn::GeluFunctor'
|
||||
opencv4[opengl]:x64-linux=feature-fails
|
||||
opencv4[opengl](android)=feature-fails
|
||||
opencv4[opengl](windows&!uwp)=feature-fails # Option WITH_OPENGL is enabled but corresponding dependency have not been found: "HAVE_OPENGL" is FALSE
|
||||
opencv4[openvino]:arm64-osx=feature-fails
|
||||
opencv4[opengl](windows & !uwp)=feature-fails # Option WITH_OPENGL is enabled but corresponding dependency have not been found: "HAVE_OPENGL" is FALSE
|
||||
opencv4[ovis](android)=feature-fails
|
||||
opencv4[vtk]:arm64-windows-static-md=feature-fails
|
||||
opencv4[vtk]:arm64-windows=feature-fails
|
||||
opencv4[vulkan]:arm64-osx=feature-fails
|
||||
opencv4[vulkan](arm & windows & !uwp) = feature-fails
|
||||
openmvg[core](arm & windows & !uwp) = combination-fails # nmmintrin.h(17): fatal error C1189: #error: This header is specific to X86, X64, ARM64, and ARM64EC targets. See https://github.com/microsoft/vcpkg/issues/33746
|
||||
openmvg[openmp](arm & windows & !uwp) = feature-fails
|
||||
openscap[python](!windows) = feature-fails # CI image lacks swig
|
||||
|
|
|
|||
|
|
@ -7174,7 +7174,7 @@
|
|||
},
|
||||
"opencv4": {
|
||||
"baseline": "4.11.0",
|
||||
"port-version": 7
|
||||
"port-version": 8
|
||||
},
|
||||
"opendnp3": {
|
||||
"baseline": "3.1.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d08af82a6cbafef4648d36f67db43144c3b441e8",
|
||||
"version": "4.11.0",
|
||||
"port-version": 8
|
||||
},
|
||||
{
|
||||
"git-tree": "13b9c235bf7c351dee012da006995e26d2c9b709",
|
||||
"version": "4.11.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue