[vcpkg baseline][opencv] Let lapack be controlled by the lapack port. (#30883)

Related: #30570.
Alternative to: #30754.
This commit is contained in:
Billy O'Neal 2023-04-17 11:29:30 -07:00 committed by GitHub
parent 501db0f17e
commit 1e68748a7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 24 additions and 6 deletions

View File

@ -111,6 +111,7 @@ vcpkg_cmake_configure(
-DWITH_ZLIB=ON
-WITH_GTK=${WITH_GTK}
-DWITH_CUBLAS=OFF # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix
-DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON
)
vcpkg_cmake_install()

View File

@ -1,7 +1,7 @@
{
"name": "opencv2",
"version": "2.4.13.7",
"port-version": 17,
"port-version": 18,
"description": "Open Source Computer Vision Library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",

View File

@ -398,6 +398,7 @@ vcpkg_cmake_configure(
###### Additional build flags
${ADDITIONAL_BUILD_FLAGS}
-DBUILD_IPP_IW=${WITH_IPP}
-DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON
)
vcpkg_cmake_install()

View File

@ -1,7 +1,7 @@
{
"name": "opencv3",
"version": "3.4.18",
"port-version": 7,
"port-version": 8,
"description": "Open Source Computer Vision Library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",

View File

@ -445,6 +445,7 @@ vcpkg_cmake_configure(
###### Additional build flags
${ADDITIONAL_BUILD_FLAGS}
-DBUILD_IPP_IW=${WITH_IPP}
-DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON
)
vcpkg_cmake_install()

View File

@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.7.0",
"port-version": 4,
"port-version": 5,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",

View File

@ -5790,15 +5790,15 @@
},
"opencv2": {
"baseline": "2.4.13.7",
"port-version": 17
"port-version": 18
},
"opencv3": {
"baseline": "3.4.18",
"port-version": 7
"port-version": 8
},
"opencv4": {
"baseline": "4.7.0",
"port-version": 4
"port-version": 5
},
"opendnp3": {
"baseline": "3.1.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "246c2e39fa6e117cbea4548446b7f66909de3329",
"version": "2.4.13.7",
"port-version": 18
},
{
"git-tree": "0a9a6ab1907e36f372e3b379dcd1ddc7cfd96980",
"version": "2.4.13.7",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e026bd638aec52f279cbf10d7e75a0f6ca03feb6",
"version": "3.4.18",
"port-version": 8
},
{
"git-tree": "e28602bbfb118017bb2bf45795e0bfd9900af4dc",
"version": "3.4.18",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0c3c175e672cc3a6f0d1465adba8a40a042ff717",
"version": "4.7.0",
"port-version": 5
},
{
"git-tree": "99e88adacfd87e496dddba403025e0fdd3b336b7",
"version": "4.7.0",