From dba5cc8a765bfa8b4a6be7e9e530ccbad829bfbd Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:24:54 -0800
Subject: [PATCH] [civetweb] add option support USE_ZLIB (#36083)

* [civetweb] add option support USE_ZLIB

* update version

---------

Co-authored-by: vzhli17 <v-zhli17@microsoft.com>
---
 ports/civetweb/portfile.cmake | 1 +
 ports/civetweb/vcpkg.json     | 5 +++--
 versions/baseline.json        | 2 +-
 versions/c-/civetweb.json     | 5 +++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake
index 35cc9d1635..caa0b31130 100644
--- a/ports/civetweb/portfile.cmake
+++ b/ports/civetweb/portfile.cmake
@@ -31,6 +31,7 @@ vcpkg_cmake_configure(
         -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF
         -DCIVETWEB_ENABLE_WEBSOCKETS=ON
         -DCIVETWEB_ALLOW_WARNINGS=ON
+        -DCIVETWEB_ENABLE_ZLIB=ON
         "-DVERSION=${VERSION}"
         ${FEATURE_OPTIONS}
 )
diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json
index 9c09781558..bb2dd92aa3 100644
--- a/ports/civetweb/vcpkg.json
+++ b/ports/civetweb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "civetweb",
   "version": "1.16",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Easy to use, powerful, C/C++ embeddable web server.",
   "homepage": "https://github.com/civetweb/civetweb",
   "supports": "!uwp",
@@ -13,7 +13,8 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "zlib"
   ],
   "features": {
     "ssl": {
diff --git a/versions/baseline.json b/versions/baseline.json
index bd0321edea..0b2287bea5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1586,7 +1586,7 @@
     },
     "civetweb": {
       "baseline": "1.16",
-      "port-version": 1
+      "port-version": 2
     },
     "cjson": {
       "baseline": "1.7.16",
diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json
index 3faace72dd..1e1a69ef06 100644
--- a/versions/c-/civetweb.json
+++ b/versions/c-/civetweb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e4dd629e48dc2fc142165bf825c99512544b568c",
+      "version": "1.16",
+      "port-version": 2
+    },
     {
       "git-tree": "23fa18e460290d6b0629ca6487f69b56845cfbda",
       "version": "1.16",