aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <925731795@qq.com>2019-07-08 14:00:33 +0800
committerPhil Christensen <philc@microsoft.com>2019-07-07 23:00:33 -0700
commitd5959f2e4c8efcf22048beca8e393058e37a3ead (patch)
tree71babb601a72a2451fcec4d27984059589fdb3dc
parent1053d5b386778536b64a42afd1198e91581721bc (diff)
downloadvcpkg-d5959f2e4c8efcf22048beca8e393058e37a3ead.tar.gz
vcpkg-d5959f2e4c8efcf22048beca8e393058e37a3ead.zip
[civetweb] Upgrade to export cmake targets and enable feature websockets in default (#7166)
-rw-r--r--ports/civetweb/CONTROL2
-rw-r--r--ports/civetweb/portfile.cmake9
2 files changed, 7 insertions, 4 deletions
diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL
index a8b0832e0..b24a4ffec 100644
--- a/ports/civetweb/CONTROL
+++ b/ports/civetweb/CONTROL
@@ -1,3 +1,3 @@
Source: civetweb
-Version: 1.11-1
+Version: 2019-07-05
Description: Easy to use, powerful, C/C++ embeddable web server.
diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake
index 8ad7af538..17a0d7f45 100644
--- a/ports/civetweb/portfile.cmake
+++ b/ports/civetweb/portfile.cmake
@@ -9,8 +9,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO civetweb/civetweb
- REF v1.11
- SHA512 e1520fd2f4a54b6ab4838f4da2ce3f0956e9884059467d196078935a3fce61dad619f3bb1bc2b4c6a757e1a8abfed0e83cba38957c7c52fff235676e9dd1d428
+ REF 2c1caa6e690bfe3b435a10c372ab2dcd14b872e8
+ SHA512 bfd37906f85c10649108f83e755f28f058c0c27b0d597e6eb82f097db7fa043f6014984f1735c904d0e01c8a5e0dc45f1c57c1fb45b08bce78f42539e19160d6
HEAD_REF master
)
@@ -24,13 +24,16 @@ vcpkg_configure_cmake(
-DCIVETWEB_ENABLE_IPV6=ON
-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF
-DCIVETWEB_ENABLE_SSL=OFF
+ -DCIVETWEB_ENABLE_WEBSOCKETS=ON
)
vcpkg_install_cmake()
-vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/civetweb)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/civetweb/copyright COPYONLY)
+
+vcpkg_copy_pdbs()