Update vcpkg refs to OpenCV 4.5.1

This commit is contained in:
Stefano Sinigardi 2021-01-29 08:30:06 +01:00
parent 5f84f90909
commit 05bda64c92
2 changed files with 5 additions and 5 deletions

View File

@ -107,7 +107,7 @@ jobs:
with: with:
setupOnly: true setupOnly: true
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88' vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2'
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
vcpkgTriplet: 'x64-linux' vcpkgTriplet: 'x64-linux'
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
@ -284,7 +284,7 @@ jobs:
with: with:
setupOnly: true setupOnly: true
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88' vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2'
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
vcpkgTriplet: 'x64-osx' vcpkgTriplet: 'x64-osx'
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
@ -402,7 +402,7 @@ jobs:
with: with:
setupOnly: true setupOnly: true
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88' vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2'
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
vcpkgTriplet: 'x64-windows' vcpkgTriplet: 'x64-windows'
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed

View File

@ -113,10 +113,10 @@ if(ENABLE_CUDA)
80 IN_LIST CMAKE_CUDA_ARCHITECTURES OR 80 IN_LIST CMAKE_CUDA_ARCHITECTURES OR
86 IN_LIST CMAKE_CUDA_ARCHITECTURES) 86 IN_LIST CMAKE_CUDA_ARCHITECTURES)
set(ENABLE_CUDNN_HALF "TRUE" CACHE BOOL "Enable CUDNN Half precision" FORCE) set(ENABLE_CUDNN_HALF "TRUE" CACHE BOOL "Enable CUDNN Half precision" FORCE)
message(STATUS "Your setup supports half precision (it requires CC >= 7.0)") message(STATUS "Your setup supports half precision (CUDA_ARCHITECTURES >= 70)")
else() else()
set(ENABLE_CUDNN_HALF "FALSE" CACHE BOOL "Enable CUDNN Half precision" FORCE) set(ENABLE_CUDNN_HALF "FALSE" CACHE BOOL "Enable CUDNN Half precision" FORCE)
message(STATUS "Your setup does not support half precision (it requires CC >= 7.0)") message(STATUS "Your setup does not support half precision (it requires CUDA_ARCHITECTURES >= 70)")
endif() endif()
endif() endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)