use same logic for all enables: if on, then package is required

uf-mil · Feb 20, 2021 · fd6ea9b · fd6ea9b
1 parent b9d296e
commit fd6ea9b
Show file tree

Hide file tree

Showing 2 changed files with 9 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: '865de0c130f3d34174ac7a410789df3c44a27fd2'
+        vcpkgGitCommitId: '99dc49dae7e170c3be63dd097230007f3bb73c4f'
         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: '865de0c130f3d34174ac7a410789df3c44a27fd2'
+        vcpkgGitCommitId: '99dc49dae7e170c3be63dd097230007f3bb73c4f'
         appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
         vcpkgTriplet: 'x64-osx'
         additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
@@ -388,7 +388,7 @@ jobs:
       with:
         setupOnly: true
         vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-        vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2'
+        vcpkgGitCommitId: '99dc49dae7e170c3be63dd097230007f3bb73c4f'
         appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
         vcpkgTriplet: 'x64-windows'
         additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,6 +64,10 @@ if(ENABLE_VCPKG_INTEGRATION AND DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TO
   set(USE_INTEGRATED_LIBS "FALSE" CACHE BOOL "Use libs distributed with this repo")
 elseif(DEFINED CMAKE_TOOLCHAIN_FILE)
   message(STATUS "Using toolchain: ${CMAKE_TOOLCHAIN_FILE}")
+  if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg.cmake")
+    message(STATUS "Toolchain uses VCPKG integration")
+    message(STATUS "VCPKG_MANIFEST_FEATURES: ${VCPKG_MANIFEST_FEATURES}")
+  endif()
   set(USE_INTEGRATED_LIBS "FALSE" CACHE BOOL "Use libs distributed with this repo")
 elseif(WIN32)
   message(STATUS "vcpkg not found, toolchain not defined, using integrated libs on win32")
@@ -153,7 +157,7 @@ if(MSVC)
   find_package(PThreads_windows REQUIRED)
 endif()
 if(ENABLE_OPENCV)
-  find_package(OpenCV)
+  find_package(OpenCV REQUIRED)
   if(OpenCV_FOUND)
     if(SELECT_OPENCV_MODULES)
       if(TARGET opencv_world)
@@ -240,7 +244,7 @@ if(OpenCV_FOUND)
 endif()
 
 if(ENABLE_CUDA AND ENABLE_CUDNN)
-  find_package(CUDNN)
+  find_package(CUDNN REQUIRED)
 endif()
 
 if(ENABLE_CUDA)