mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 22:01:37 +08:00
[opencv4] fix feature ovis (#32578)
This commit is contained in:
parent
edd3db2e3b
commit
ef19b3e8bb
9
ports/opencv4/0019-fix-ogre-dependency.patch
Normal file
9
ports/opencv4/0019-fix-ogre-dependency.patch
Normal file
@ -0,0 +1,9 @@
|
||||
--- a/modules/ovis/CMakeLists.txt
|
||||
+++ b/modules/ovis/CMakeLists.txt
|
||||
@@ -27,4 +27,6 @@ ocv_create_module()
|
||||
ocv_add_samples(opencv_aruco)
|
||||
|
||||
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter)
|
||||
+# The target always has the name OgreGLSupport
|
||||
+string(REPLACE "OgreGLSupportStatic" "OgreGLSupport" OGRE_LIBRARIES "${OGRE_LIBRARIES}")
|
||||
ocv_target_link_libraries(${the_module} ${OGRE_LIBRARIES})
|
@ -71,6 +71,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
"nonfree" OPENCV_ENABLE_NONFREE
|
||||
"openexr" WITH_OPENEXR
|
||||
"opengl" WITH_OPENGL
|
||||
"ovis" CMAKE_REQUIRE_FIND_PACKAGE_OGRE
|
||||
"png" WITH_PNG
|
||||
"quirc" WITH_QUIRC
|
||||
"sfm" BUILD_opencv_sfm
|
||||
@ -183,6 +184,7 @@ if("contrib" IN_LIST FEATURES)
|
||||
0007-fix-hdf5.patch
|
||||
0016-fix-freetype-contrib.patch
|
||||
0018-fix-depend-tesseract.patch
|
||||
0019-fix-ogre-dependency.patch
|
||||
)
|
||||
set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "opencv4",
|
||||
"version": "4.8.0",
|
||||
"port-version": 4,
|
||||
"port-version": 5,
|
||||
"description": "computer vision library",
|
||||
"homepage": "https://github.com/opencv/opencv",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -6018,7 +6018,7 @@
|
||||
},
|
||||
"opencv4": {
|
||||
"baseline": "4.8.0",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"opendnp3": {
|
||||
"baseline": "3.1.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "6deec5bdb97d4d3a667aa10e31698ce54abdc9a7",
|
||||
"version": "4.8.0",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "0d0ef2f6aa4911ca1cf367093c0b6a89cea97fe3",
|
||||
"version": "4.8.0",
|
||||
|
Loading…
Reference in New Issue
Block a user