aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-06-24 04:12:42 +0800
committerGitHub <noreply@github.com>2020-06-23 13:12:42 -0700
commit088963227e7babc3537b804224dc234143b5ad1c (patch)
tree481c73395bb5c7ebc74baa059dc2932858c857fd
parent2ad479e667a0dae4e3fe279a0103414c7af7263c (diff)
downloadvcpkg-088963227e7babc3537b804224dc234143b5ad1c.tar.gz
vcpkg-088963227e7babc3537b804224dc234143b5ad1c.zip
[cpprestsdk] Fix usage issue when building static (#12006)
-rw-r--r--ports/cpprestsdk/CONTROL2
-rw-r--r--ports/cpprestsdk/portfile.cmake5
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index 64ce95aae..30f24ed6b 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
Source: cpprestsdk
-Version: 2.10.16-2
+Version: 2.10.16-3
Build-Depends: openssl (!uwp&!windows), boost-system (!uwp&!windows),
boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows),
boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows),
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index 8142c22a9..a9f1ce3f2 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -45,4 +45,9 @@ vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/${PORT})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h
+ "#ifdef _NO_ASYNCRTIMP" "#if 1")
+endif()
+
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)