Merge pull request #9 from rbsheth/hunter-3.6.1.3

Update to v3.6.1.3 plus cherry-picked commit

CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.0)
+
+include("cmake/HunterGate.cmake")
+HunterGate(
+    URL "https://github.com/ruslo/hunter/archive/v0.15.9.tar.gz"
+    SHA1 "3e1da8447bfdbf9514f42abf8ff05455530b9b1c"
+)
+
+# Project
+project(protobuf C CXX)
+
+hunter_add_package(ZLIB)
+
+add_subdirectory(cmake)

cmake/CMakeLists.txt

@@ -105,10 +105,10 @@ if (protobuf_WITH_ZLIB)
     # Set ZLIB_INCLUDE_DIRECTORIES for compatible
     set(ZLIB_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS})
     # Using imported target if exists
-    if (TARGET ZLIB::ZLIB)
-      set(ZLIB_LIBRARIES ZLIB::ZLIB)
+    if (TARGET ZLIB::zlib)
+      set(ZLIB_LIBRARIES ZLIB::zlib)
       set(_protobuf_FIND_ZLIB "if(NOT ZLIB_FOUND)\n  find_package(ZLIB)\nendif()")
-    endif (TARGET ZLIB::ZLIB)
+    endif (TARGET ZLIB::zlib)
   else (ZLIB_FOUND)
     set(HAVE_ZLIB 0)
     # Explicitly set these to empty (override NOT_FOUND) so cmake doesn't