From d3c432d955df8768f9c3b88f2fb96dd10644a305 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Thu, 11 Mar 2021 04:01:27 +0800
Subject: [PATCH] [hiredis] Fix include path (#16512)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [hiredis] Fix include path

* Update versions

* Update ports/hiredis/vcpkg.json

* Update versions/h-/hiredis.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
---
 ports/hiredis/CONTROL                | 13 -------------
 ports/hiredis/fix-include-path.patch | 13 +++++++++++++
 ports/hiredis/portfile.cmake         |  1 +
 ports/hiredis/vcpkg.json             | 23 +++++++++++++++++++++++
 versions/baseline.json               |  2 +-
 versions/h-/hiredis.json             |  5 +++++
 6 files changed, 43 insertions(+), 14 deletions(-)
 delete mode 100644 ports/hiredis/CONTROL
 create mode 100644 ports/hiredis/fix-include-path.patch
 create mode 100644 ports/hiredis/vcpkg.json

diff --git a/ports/hiredis/CONTROL b/ports/hiredis/CONTROL
deleted file mode 100644
index a331b173517..00000000000
--- a/ports/hiredis/CONTROL
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: hiredis
-Version: 1.0.0
-Port-Version: 0
-Homepage: https://github.com/redis/hiredis
-Description: Hiredis is a minimalistic C client library for the Redis database.
-
-Feature: ssl
-Description: Build hiredis_ssl for SSL support
-Build-Depends: openssl
-
-Feature: example
-Description: Build example
-Build-Depends: libevent, pthread, libuv
\ No newline at end of file
diff --git a/ports/hiredis/fix-include-path.patch b/ports/hiredis/fix-include-path.patch
new file mode 100644
index 00000000000..8bfeae09d7e
--- /dev/null
+++ b/ports/hiredis/fix-include-path.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7eafeb8..623c586 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,7 @@ IF(WIN32 OR MINGW)
+     TARGET_LINK_LIBRARIES(hiredis PRIVATE ws2_32)
+ ENDIF()
+ 
+-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:.> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
++TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ 
+ CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY)
+ 
diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake
index 0c72c83305c..d0b273c7719 100644
--- a/ports/hiredis/portfile.cmake
+++ b/ports/hiredis/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
         fix-feature-example.patch
         support-static-in-win.patch
         fix-timeval.patch
+        fix-include-path.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json
new file mode 100644
index 00000000000..862214eb8b0
--- /dev/null
+++ b/ports/hiredis/vcpkg.json
@@ -0,0 +1,23 @@
+{
+  "name": "hiredis",
+  "version": "1.0.0",
+  "port-version": 1,
+  "description": "Hiredis is a minimalistic C client library for the Redis database.",
+  "homepage": "https://github.com/redis/hiredis",
+  "features": {
+    "example": {
+      "description": "Build example",
+      "dependencies": [
+        "libevent",
+        "libuv",
+        "pthread"
+      ]
+    },
+    "ssl": {
+      "description": "Build hiredis_ssl for SSL support",
+      "dependencies": [
+        "openssl"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index c57ce41b8e0..f6bf334d08c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2418,7 +2418,7 @@
     },
     "hiredis": {
       "baseline": "1.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "hpx": {
       "baseline": "1.6.0",
diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json
index 5522d98ffda..50d4361ee4c 100644
--- a/versions/h-/hiredis.json
+++ b/versions/h-/hiredis.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3ce136eecabedaebd15eb4a454c2ecf89f90e9c3",
+      "version": "1.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e9c2ffbff25b0e22f0b09ec594b3f4288f685762",
       "version-string": "1.0.0",