diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
| commit | 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch) | |
| tree | 7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /ports/cpprestsdk | |
| parent | 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff) | |
| parent | 9b21ff9612916e24f89c6839599d3d50446597d8 (diff) | |
| download | vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/cpprestsdk')
| -rw-r--r-- | ports/cpprestsdk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cpprestsdk/portfile.cmake | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index cd52abbbf..2693d2390 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,5 +1,5 @@ Source: cpprestsdk -Version: 2.10.3-1 +Version: 2.10.6-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. diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 5a26487c5..c84e6ff90 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.3 - SHA512 0003d1230f7f26424b71f705fd95c3907b60ac0d574ef6199081a8edd385d1469f405cf973c074fe6a4fc71f585e5e42862940d285ba575075dec4cb27774c36 + REF v2.10.6 + SHA512 f0848f329df80ced68132600914f0f4ba1ed42c7c16188e0f2bd41cf0c50173c27ca42c8db72ff239ca881bc8789fa4d1e3189c492832f6c22d36d504b7ce8dd HEAD_REF master ) @@ -32,7 +32,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/share") # transition + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) +else() + vcpkg_fixup_cmake_targets() # v2.10.6 and below +endif() + + file(INSTALL ${SOURCE_PATH}/license.txt |