aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2018-10-15 14:39:28 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2018-10-15 21:32:28 -0700
commit5d0b56d7c1b30709a4fc6c7899ef01781ee155e6 (patch)
treedbed7e9e7c63e58ecaee6e32e10afdb87fecacd8
parent10e7bd5772ca1a5d315200ba6c7541141e72b935 (diff)
downloadvcpkg-5d0b56d7c1b30709a4fc6c7899ef01781ee155e6.tar.gz
vcpkg-5d0b56d7c1b30709a4fc6c7899ef01781ee155e6.zip
[cpprestsdk] Fix fixup_targets for new versions of cpprestsdk
-rw-r--r--ports/cpprestsdk/CONTROL2
-rw-r--r--ports/cpprestsdk/portfile.cmake9
2 files changed, 9 insertions, 2 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index 8a7d2aa06..2693d2390 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
Source: cpprestsdk
-Version: 2.10.6
+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 7b816fb79..c84e6ff90 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -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