aboutsummaryrefslogtreecommitdiff
path: root/ports/cpprestsdk
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-02-08 15:24:59 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-02-08 15:24:59 -0800
commit4d433302417d7e2b6478d731bc222847c2cd434a (patch)
tree41c93a7ad44df67657cf8413fed745048579baf5 /ports/cpprestsdk
parent95af9aac7c39765d1524b7c9c39dc283e9f0facf (diff)
parent2e94dfe97ca44dd78b3224321b5f9e06e6635854 (diff)
downloadvcpkg-4d433302417d7e2b6478d731bc222847c2cd434a.tar.gz
vcpkg-4d433302417d7e2b6478d731bc222847c2cd434a.zip
Merge branch 'master' into codicodi-ninja-support
Diffstat (limited to 'ports/cpprestsdk')
-rw-r--r--ports/cpprestsdk/CONTROL4
-rw-r--r--ports/cpprestsdk/portfile.cmake4
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index b3438026f..f284f2b53 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
Source: cpprestsdk
-Version: 2.9.0-1
-Build-Depends: zlib [windows], openssl [windows], boost [windows]
+Version: 2.9.0-2
+Build-Depends: zlib [windows], openssl [windows], boost [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. \ No newline at end of file
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index d1b5fa7f6..f92c5147a 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -15,9 +15,13 @@ vcpkg_apply_patches(
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
)
+SET(WEBSOCKETPP_PATH "${CURRENT_INSTALLED_DIR}/share/websocketpp")
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Release
OPTIONS
+ -DWEBSOCKETPP_CONFIG=${WEBSOCKETPP_PATH}
+ -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}
-DBUILD_TESTS=OFF
-DBUILD_SAMPLES=OFF
-DCPPREST_EXCLUDE_WEBSOCKETS=OFF