Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[CUDA, CUDNN] fix support clause (#23900) 

* [CUDA, CUDNN] fix support clause

* [cuda] use version key

* [opencv2] format manifest

* fix references

* Update vcpkg.json

* Update vcpkg.json

* Update version database

* Update version database.

* fix feature descriptions

* fix references

* add missing licenses

* fix references

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Stefano Sinigardi 2022-04-05 20:50:48 +02:00 committed by GitHub
parent 5bf1323378
commit e79aaaaf3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/cuda/vcpkg.json
View File

@ -1,8 +1,9 @@
{
"name": "cuda",
"version-string": "10.1",
"port-version": 9,
"version": "10.1",
"port-version": 10,
"description": "A parallel computing platform and programming model",
"homepage": "https://developer.nvidia.com/cuda-toolkit",
"supports": "linux | (!osx & !uwp & !(arm64 & windows))"
"license": null,
"supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)"
}

5
ports/cudnn/vcpkg.json
View File

@ -1,10 +1,11 @@
{
"name": "cudnn",
"version": "7.6.5",
"port-version": 4,
"port-version": 5,
"description": "NVIDIA's cuDNN deep neural network acceleration library.",
"homepage": "https://developer.nvidia.com/cudnn",
"supports": "(windows | linux) & x64",
"license": null,
"supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)",
"dependencies": [
"cuda"
]

10
ports/opencv2/portfile.cmake
View File

@ -6,14 +6,8 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4")
message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4")
endif()
if (VCPKG_TARGET_IS_UWP)
# - opengl feature is broken on UWP
# - jasper and openexr are not available on UWP due to missing dependencies
# - opencv2 code itself fails even if previous conditions are avoided
message(FATAL_ERROR "${PORT} doesn't support UWP")
endif()
set(OPENCV_VERSION "2.4.13.7")
file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents)
string(JSON OPENCV_VERSION GET "${_contents}" version)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH

6
ports/opencv2/vcpkg.json
View File

@ -1,9 +1,11 @@
{
"name": "opencv2",
"version": "2.4.13.7",
"port-version": 9,
"port-version": 10,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
@ -70,7 +72,7 @@
]
},
"gtk": {
"description": "GDCM support for opencv",
"description": "GTK support for opencv",
"dependencies": [
"gtk"
]

4
ports/opencv3/portfile.cmake
View File

@ -6,7 +6,9 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4")
message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4")
endif()
set(OPENCV_VERSION "3.4.16")
file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents)
string(JSON OPENCV_VERSION GET "${_contents}" version)
set(USE_QT_VERSION "5")
vcpkg_from_github(

2
ports/opencv3/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "opencv3",
"version": "3.4.16",
"port-version": 4,
"port-version": 5,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",

4
ports/opencv4/portfile.cmake
View File

@ -6,7 +6,9 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3")
message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3")
endif()
set(OPENCV_VERSION "4.5.5")
file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents)
string(JSON OPENCV_VERSION GET "${_contents}" version)
set(USE_QT_VERSION "5")
vcpkg_from_github(

3
ports/opencv4/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "opencv4",
"version": "4.5.5",
"port-version": 1,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
@ -136,7 +137,7 @@
]
},
"gtk": {
"description": "GDCM support for opencv",
"description": "GTK support for opencv",
"dependencies": [
"gtk"
]

10
versions/baseline.json
View File

@ -1714,11 +1714,11 @@
},
"cuda": {
"baseline": "10.1",
"port-version": 9
"port-version": 10
},
"cudnn": {
"baseline": "7.6.5",
"port-version": 4
"port-version": 5
},
"cunit": {
"baseline": "2.1.3",
@ -5062,15 +5062,15 @@
},
"opencv2": {
"baseline": "2.4.13.7",
"port-version": 9
"port-version": 10
},
"opencv3": {
"baseline": "3.4.16",
"port-version": 4
"port-version": 5
},
"opencv4": {
"baseline": "4.5.5",
"port-version": 0
"port-version": 1
},
"opendnp3": {
"baseline": "3.1.1",

5
versions/c-/cuda.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4e8939c3547a570a73098c091da7b9e28f71015c",
"version": "10.1",
"port-version": 10
},
{
"git-tree": "7895738a8a164beddfb53c4c69352b202d8e13e9",
"version-string": "10.1",

5
versions/c-/cudnn.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "62f2616b19fe2b3b7dbc8a81e190900819f2ba3e",
"version": "7.6.5",
"port-version": 5
},
{
"git-tree": "c23360a6cfba2b5c8962c0c106d165ca31224162",
"version": "7.6.5",

5
versions/o-/opencv2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "04d0949582f825d8a93c13fe0be0acbe8183073b",
"version": "2.4.13.7",
"port-version": 10
},
{
"git-tree": "e02e468ae088086be3b3579366e0bc4c3c8be6cc",
"version": "2.4.13.7",

5
versions/o-/opencv3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "55064c574fa80aef66dd85a330f669ba7ad402e9",
"version": "3.4.16",
"port-version": 5
},
{
"git-tree": "7060d481bf3045fdd24aa8ef0d83cf2db3b13a50",
"version": "3.4.16",

5
versions/o-/opencv4.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dcdd746ffc69d5f3234b67ee17fdd54966c8f5cb",
"version": "4.5.5",
"port-version": 1
},
{
"git-tree": "afed148d21295bf99e8ac657fdb808ed82467871",
"version": "4.5.5",