Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

4 files changed, 7 insertions, 126 deletions

diff --git a/ports/cpprestsdk/0001_cmake.patch b/ports/cpprestsdk/0001_cmake.patch
deleted file mode 100644
index be8f2cff7..000000000
--- a/ports/cpprestsdk/0001_cmake.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
-index 1274102..fe245e6 100644
---- a/Release/CMakeLists.txt
-+++ b/Release/CMakeLists.txt
-@@ -89,15 +89,6 @@ elseif(UNIX) # This includes OSX
- 
-   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
-   option(BUILD_SAMPLES "Build samples." ON)
--  option(CASA_INSTALL_HEADERS "Install header files." ON)
--  if(CASA_INSTALL_HEADERS)
--    file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h include/cpprest/*.dat)
--    install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
--    file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
--    install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
--    file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h include/cpprest/details/*.dat)
--    install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
--  endif()
- elseif(WIN32)
-   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
-   option(BUILD_SAMPLES "Build samples." ON)
-@@ -113,37 +104,25 @@ elseif(WIN32)
-     set(Casablanca_DEFINITIONS "" CACHE INTERNAL "Definitions for consume casablanca library")
-   endif()
-   add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
--
--  if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
--    set(NUGET_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../packages")
--    set(PACKAGE_PATHS)
--    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost.1.58.0.0/")
--    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_system-vc140.1.58.0-vs140rc/")
--    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_date_time-vc140.1.58.0-vs140rc/")
--    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_regex-vc140.1.58.0-vs140rc/")
--    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1/")
--    list(APPEND PACKAGE_PATHS "${NUGET_PATH}/zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8/")
--
--    if (NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
--      find_library(Boost_SYSTEM_LIBRARY libboost_system-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
--      find_library(Boost_DATE_TIME_LIBRARY libboost_date_time-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
--      find_library(Boost_REGEX_LIBRARY libboost_regex-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
--      set(Boost_LIBRARIES ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
--  
--      find_library(OpenSSL_libeay_LIBRARY libeay32.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
--      find_library(OpenSSL_ssleay_LIBRARY ssleay32.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
--      find_library(ZLIB_LIBRARY zlibstaticd.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
--      set(OPENSSL_LIBRARIES ${OpenSSL_ssleay_LIBRARY} ${OpenSSL_libeay_LIBRARY} ${ZLIB_LIBRARY})
--
--      set(OPENSSL_INCLUDE_DIR "${NUGET_PATH}/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1/build/native/include")
--    endif()
--
--    set(Boost_INCLUDE_DIR "${NUGET_PATH}/boost.1.58.0.0/lib/native/include")
--  endif()
-+  if (NOT CPPREST_EXCLUDE_WEBSOCKETS AND NOT WINDOWS_STORE)
-+    find_package(ZLIB REQUIRED)
-+    find_package(OpenSSL REQUIRED)
-+    find_package(Boost REQUIRED COMPONENTS regex system date_time)
-+   endif()
- else()
-   message(FATAL_ERROR "-- Unsupported Build Platform.")
- endif()
- 
-+option(CASA_INSTALL_HEADERS "Install header files." ON)
-+if(CASA_INSTALL_HEADERS)
-+  file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h include/cpprest/*.dat)
-+  install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
-+  file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
-+  install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
-+  file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h include/cpprest/details/*.dat)
-+  install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
-+endif()
-+
- # Compiler (not platform) specific settings
- if(ANDROID)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
-index 4074905..da907e5 100644
---- a/Release/src/CMakeLists.txt
-+++ b/Release/src/CMakeLists.txt
-@@ -144,10 +144,11 @@ elseif(ANDROID)
- else()
-   set_target_properties(cpprest PROPERTIES
-     SOVERSION ${CPPREST_VERSION_MAJOR}.${CPPREST_VERSION_MINOR})
--
--  install(
--    TARGETS cpprest
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
--    )
- endif()
-+
-+install(
-+  TARGETS cpprest
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+  )
-\ No newline at end of file
diff --git a/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch b/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch
deleted file mode 100644
index ab54baf01..000000000
--- a/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/release/CMakeLists.txt b/release/CMakeLists.txt
-index fe245e6..94a5c57 100644
---- a/release/CMakeLists.txt
-+++ b/release/CMakeLists.txt
-@@ -177,7 +177,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
- 
- # These settings can be used by the test targets
- set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
--if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
-+if (NOT CPPREST_EXCLUDE_WEBSOCKETS AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
-   find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
-                         HINTS /usr/lib/cmake/websocketpp)
-   find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index f284f2b53..7e6dbc0d1 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.9.0-2
-Build-Depends: zlib [windows], openssl [windows], boost [windows], websocketpp [windows]
+Version: 2.10.2-1
+Build-Depends: zlib, openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp), websocketpp (!uwp), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!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
+  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 ea7d8d201..46686bb0a 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -3,18 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cpprestsdk
-    REF v2.9.0
-    SHA512 c75de6ad33b3e8d2c6ba7c0955ed851d557f78652fb38a565de0cfbc99e7db89cb6fa405857512e5149df80356c51ae9335abd914c3c593fa6658ac50adf4e29
+    REF v2.10.2
+    SHA512 267a928f770a668874f9b7e381e8977ffa3478c9292df4ed93d4235d20f0e89b1bfe4cfc82945d3f28fe2746a4fe6089009c4839dac5db130494bb3a395dd198
     HEAD_REF master
 )
-if(NOT VCPKG_USE_HEAD_VERSION)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES
-            ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
-            ${CMAKE_CURRENT_LIST_DIR}/0002_no_websocketpp_in_uwp.patch
-    )
-endif()
 
 set(OPTIONS)
 if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@@ -33,16 +25,14 @@ vcpkg_configure_cmake(
         -DBUILD_SAMPLES=OFF
         -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
         -DCPPREST_EXPORT_DIR=share/cpprestsdk
+        -DWERROR=OFF
     OPTIONS_DEBUG
-        -DCASA_INSTALL_HEADERS=OFF
         -DCPPREST_INSTALL_HEADERS=OFF
 )
 
 vcpkg_install_cmake()
 
-if(VCPKG_USE_HEAD_VERSION)
-    vcpkg_fixup_cmake_targets()
-endif()
+vcpkg_fixup_cmake_targets()
 
 file(INSTALL
     ${SOURCE_PATH}/license.txt