Merge pull request #668 from elucideye/pr.update.drishti.upload

update drishti-upload
elucideye · May 25, 2018 · 8815d29 · 8815d29
2 parents f0f5a9c + 1b0728d
commit 8815d29
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,8 +60,8 @@ if(DRISHTI_USE_DRISHTI_UPLOAD)
   )
   endif()
 else()
-  set(DRISHTI_HUNTER_GATE_URL "https://github.com/ruslo/hunter/archive/v0.21.15.tar.gz")
-  set(DRISHTI_HUNTER_GATE_SHA1 "f52db0eb7c1663d4cdedbda82b61b23d5d6a75d9")
+  set(DRISHTI_HUNTER_GATE_URL "https://github.com/ruslo/hunter/archive/v0.21.18.tar.gz")
+  set(DRISHTI_HUNTER_GATE_SHA1 "19e4a2f3034baa13f215eba3aa580365c5254508")
   if(HUNTER_ENABLED AND NOT DRISHTI_IS_REPO_BUILD)
     # DEPENDENCY: if(HUNTER_ENABLE): we are being used as a dependency from
     # another project and we will use the config.cmake from the parent project.
@@ -93,7 +93,7 @@ endif()
 ### Drishti project ###
 #######################
 
-project(drishtisdk VERSION 0.12.0)
+project(drishtisdk VERSION 0.12.1)
 
 set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # for 3rd parties added by add_subdirectory
 

diff --git a/drishti-upload b/drishti-upload
diff --git a/src/3rdparty/acf b/src/3rdparty/acf
+2 −2		cmake/Modules/drishti_set_opencv_cmake_args_nix.cmake
+1 −1		cmake/Modules/drishti_set_opencv_cmake_args_osx.cmake
+2 −2		cmake/Modules/drishti_set_opencv_cmake_args_windows.cmake
+2 −2		config.cmake
+2 −2		init.cmake
+18 −17		CMakeLists.txt
+6 −0		appveyor.yml
+13 −5		bin/hunter_env.sh
+1 −1		drishti-upload