diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-04-30 00:46:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 00:46:36 -0700 |
| commit | 2bc6cd714f931c32d3299a137d5abe0f86f803e1 (patch) | |
| tree | 96b3496f7be986f5a802bebae2f6001b550ea2de | |
| parent | b4f8f14529a10ee05b166f9f12d8e6fd0a5119f6 (diff) | |
| download | vcpkg-2bc6cd714f931c32d3299a137d5abe0f86f803e1.tar.gz vcpkg-2bc6cd714f931c32d3299a137d5abe0f86f803e1.zip | |
[cpprestsdk] Update to v2.10.16 (#11018)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/cpprestsdk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cpprestsdk/portfile.cmake | 31 |
2 files changed, 11 insertions, 22 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index 6e4b6d5a1..90e88fc42 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,5 +1,5 @@ Source: cpprestsdk -Version: 2.10.15-1 +Version: 2.10.16 Build-Depends: openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 8c76683c5..ec5027174 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.15 - SHA512 ef8884c9f7fde2b6a25357ef0e7ee87b473a2e3140af2c5af0e3be7776ac2e8c0da431a356892020a3c37c84e30396350e2083cd4e1192a41fd3e099e74179f7 + REF v2.10.16 + SHA512 d850b26051439dd10edcecd006075c64c61c565193cd76870af175bd343a72ecc59485deb0f907807071a57dd256b67139ad5d016f19cb38f7142357f430be1c HEAD_REF master ) @@ -16,31 +14,22 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}) endif() -set(CPPREST_EXCLUDE_BROTLI ON) -if ("brotli" IN_LIST FEATURES) - set(CPPREST_EXCLUDE_BROTLI OFF) -endif() - -set(CPPREST_EXCLUDE_COMPRESSION ON) -if ("compression" IN_LIST FEATURES) - set(CPPREST_EXCLUDE_COMPRESSION OFF) -endif() - -set(CPPREST_EXCLUDE_WEBSOCKETS ON) -if("websockets" IN_LIST FEATURES) - set(CPPREST_EXCLUDE_WEBSOCKETS OFF) -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + brotli CPPREST_EXCLUDE_BROTLI + compression CPPREST_EXCLUDE_COMPRESSION + websockets CPPREST_EXCLUDE_WEBSOCKETS +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/Release PREFER_NINJA OPTIONS ${OPTIONS} + ${FEATURE_OPTIONS} -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF - -DCPPREST_EXCLUDE_BROTLI=${CPPREST_EXCLUDE_BROTLI} - -DCPPREST_EXCLUDE_COMPRESSION=${CPPREST_EXCLUDE_COMPRESSION} - -DCPPREST_EXCLUDE_WEBSOCKETS=${CPPREST_EXCLUDE_WEBSOCKETS} -DCPPREST_EXPORT_DIR=share/cpprestsdk -DWERROR=OFF OPTIONS_DEBUG |