mirror of https://github.com/microsoft/vcpkg.git
[opencv4] fix missing exception header when compiling with libc++ (#48288)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
parent
98405903df
commit
e84eee10d6
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
|
||||
index fc3b533..94b3b03 100644
|
||||
--- a/modules/core/src/system.cpp
|
||||
+++ b/modules/core/src/system.cpp
|
||||
@@ -50,6 +50,7 @@ direct,
|
||||
|
||||
#include "precomp.hpp"
|
||||
#include <atomic>
|
||||
+#include <exception>
|
||||
#include <iostream>
|
||||
#include <ostream>
|
||||
|
||||
--
|
||||
2.50.0
|
||||
|
||||
|
|
@ -24,6 +24,7 @@ vcpkg_from_github(
|
|||
0019-opencl-kernel.patch
|
||||
0020-fix-narrow-filesystem.diff
|
||||
0021-fix-qt-gen-def.patch
|
||||
0022-fix-miss-exception-include.patch
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(PKGCONFIG)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "opencv4",
|
||||
"version": "4.11.0",
|
||||
"port-version": 4,
|
||||
"port-version": 5,
|
||||
"description": "computer vision library",
|
||||
"homepage": "https://github.com/opencv/opencv",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -201,8 +201,9 @@ opencv4[halide](!android & !(windows & staticcrt) & !uwp & !(arm & windows))=fea
|
|||
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[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
|
||||
openmama:x64-windows-static-md=fail
|
||||
|
|
@ -1225,9 +1226,9 @@ opencv4[halide](android | (windows & staticcrt) | uwp | (arm & windows))=cascade
|
|||
openvino[npu]:x64-linux=cascade # dependency level-zero not supported
|
||||
pmdk:x64-uwp=cascade
|
||||
|
||||
opencv4[cuda,cudnn,dc1394,dnn-cuda]:arm64-windows = cascade
|
||||
opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:arm64-uwp = cascade
|
||||
opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,openexr,ovis,python,qt,sfm,tbb,vtk]:x64-uwp = cascade
|
||||
opencv4[cuda,cudnn,dc1394,dnn-cuda,vtk]:arm64-windows = cascade
|
||||
opencv4[cudnn](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)) | !((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade
|
||||
opencv4[dc1394](windows) = cascade
|
||||
opencv4[dnn-cuda](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)) | !((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade
|
||||
|
|
@ -1239,11 +1240,11 @@ opencv4[gstreamer](uwp | xbox) = cascade
|
|||
opencv4[opencl](uwp) = cascade
|
||||
opencv4[openexr](uwp) = cascade
|
||||
opencv4[opengl](uwp | xbox) = cascade
|
||||
opencv4[openvino]:arm64-osx=cascade
|
||||
opencv4[openvino](windows & arm) = cascade
|
||||
opencv4[qt](uwp | ios | xbox) = cascade
|
||||
opencv4[sfm](uwp) = cascade
|
||||
opencv4[tbb](uwp) = cascade
|
||||
opencv4[vtk]:arm64-windows-static-md = cascade
|
||||
opencv4[vtk](uwp | xbox) = cascade
|
||||
openimageio:arm64-uwp = cascade
|
||||
openimageio:x64-uwp = cascade
|
||||
|
|
|
|||
|
|
@ -7150,7 +7150,7 @@
|
|||
},
|
||||
"opencv4": {
|
||||
"baseline": "4.11.0",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"opendnp3": {
|
||||
"baseline": "3.1.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9584ee4055962b4fdf83f4d7fe378fd0e5904eb6",
|
||||
"version": "4.11.0",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "f96663c0d36e2aed2c1519d4138f712055014208",
|
||||
"version": "4.11.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue