Add 'Jpeg' dependency

ruslo · ruslo · commit f0352cf5cfc6 · 2016-11-12T16:24:00.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,8 +87,8 @@ endif()
 
 include("cmake/HunterGate.cmake")
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.10.4.tar.gz"
-    SHA1 "603c2b5f10c5b6e50628cd0b0cc5c1167cb36bfc"
+    URL "https://github.com/ruslo/hunter/archive/v0.16.24.tar.gz"
+    SHA1 "00ab627d3d4fe5151e15b6ab2b1b1da17650984a"
 )
 
 project(OpenCV CXX C)
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
@@ -421,3 +421,7 @@ endif()
 if("@PNG_FOUND@")
   find_dependency(PNG CONFIG)
 endif()
+
+if("@JPEG_FOUND@")
+  find_dependency(JPEG CONFIG)
+endif()

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,8 @@ endif()`
`87`	`87`
`88`	`88`	`include("cmake/HunterGate.cmake")`
`89`	`89`	`HunterGate(`
`90`		`- URL "https://github.com/ruslo/hunter/archive/v0.10.4.tar.gz"`
`91`		`- SHA1 "603c2b5f10c5b6e50628cd0b0cc5c1167cb36bfc"`
	`90`	`+ URL "https://github.com/ruslo/hunter/archive/v0.16.24.tar.gz"`
	`91`	`+ SHA1 "00ab627d3d4fe5151e15b6ab2b1b1da17650984a"`
`92`	`92`	`)`
`93`	`93`
`94`	`94`	`project(OpenCV CXX C)`