diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-12-05 13:01:50 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-12-19 10:26:27 -0800 |
| commit | b79395c4adf076dc57db2f7c1b0c38db4cc94f72 (patch) | |
| tree | 0eb1549cf39f99b9e07b0f53187b5d3293cb6114 /ports/cpprestsdk | |
| parent | 14358e8b257a27f86a58bf95aaca1625c1ec2a26 (diff) | |
| download | vcpkg-b79395c4adf076dc57db2f7c1b0c38db4cc94f72.tar.gz vcpkg-b79395c4adf076dc57db2f7c1b0c38db4cc94f72.zip | |
Update downstream libraries to use modularized boost
Diffstat (limited to 'ports/cpprestsdk')
| -rw-r--r-- | ports/cpprestsdk/CONTROL | 4 | ||||
| -rw-r--r-- | ports/cpprestsdk/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/cpprestsdk/undef-minmax.patch | 14 |
3 files changed, 22 insertions, 2 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index bfc2c7fe4..5dcd880f0 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,5 +1,5 @@ Source: cpprestsdk -Version: 2.10.1 -Build-Depends: zlib, openssl (windows), boost (windows), websocketpp (windows) +Version: 2.10.1-1 +Build-Depends: zlib, openssl (windows), boost-system (windows), boost-date-time (windows), boost-regex (windows), websocketpp (windows) Description: C++11 JSON, REST, and OAuth library The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services. diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index be7423997..ca22f2a5c 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -16,6 +16,11 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}) endif() +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/undef-minmax.patch" +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/Release PREFER_NINJA @@ -25,6 +30,7 @@ vcpkg_configure_cmake( -DBUILD_SAMPLES=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=OFF -DCPPREST_EXPORT_DIR=share/cpprestsdk + -DWERROR=OFF OPTIONS_DEBUG -DCPPREST_INSTALL_HEADERS=OFF ) diff --git a/ports/cpprestsdk/undef-minmax.patch b/ports/cpprestsdk/undef-minmax.patch new file mode 100644 index 000000000..4dc3bc019 --- /dev/null +++ b/ports/cpprestsdk/undef-minmax.patch @@ -0,0 +1,14 @@ +diff --git a/Release/src/http/client/http_client_winrt.cpp b/Release/src/http/client/http_client_winrt.cpp +index 697f48a..4ada65a 100644 +--- a/Release/src/http/client/http_client_winrt.cpp ++++ b/Release/src/http/client/http_client_winrt.cpp +@@ -28,6 +28,9 @@ using namespace std; + using namespace Platform; + using namespace Microsoft::WRL; + ++#undef min ++#undef max ++ + namespace web + { + namespace http |