Merge pull request #4 from Ubiquite/hunter-2.4.11

ruslo · web-flow · commit 7ff75ab3a08c · 2016-10-28T23:09:34.000+08:00
use Jpeg from hunter
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -75,6 +75,7 @@ if(WITH_JPEG)
   if(BUILD_JPEG)
     ocv_clear_vars(JPEG_FOUND)
   else()
+    hunter_add_package(Jpeg)
     include(FindJPEG)
   endif()
 
diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in
@@ -361,3 +361,9 @@ macro(ocv_list_filterout lst regex)
     endif()
   endforeach()
 endmacro()
+
+include(CMakeFindDependencyMacro)
+
+if("@JPEG_FOUND@")
+  find_dependency(JPEG CONFIG)
+endif()
