Update vcpkg refs to OpenCV 4.5.1

Tossy0423 · Jan 29, 2021 · 05bda64 · 05bda64
1 parent 5f84f90
commit 05bda64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -107,7 +107,7 @@ jobs:
       with:
         setupOnly: true
         vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-        vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88'
+        vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2'
         appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
         vcpkgTriplet: 'x64-linux'
         additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
@@ -284,7 +284,7 @@ jobs:
       with:
         setupOnly: true
         vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-        vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88'
+        vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2'
         appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
         vcpkgTriplet: 'x64-osx'
         additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
@@ -402,7 +402,7 @@ jobs:
       with:
         setupOnly: true
         vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-        vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88'
+        vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2'
         appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
         vcpkgTriplet: 'x64-windows'
         additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,10 +113,10 @@ if(ENABLE_CUDA)
          80 IN_LIST CMAKE_CUDA_ARCHITECTURES OR
          86 IN_LIST CMAKE_CUDA_ARCHITECTURES)
         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()
         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()
     if(BUILD_SHARED_LIBS)