aboutsummaryrefslogtreecommitdiff
path: root/ports/bond
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-05-26 02:52:48 +0800
committerGitHub <noreply@github.com>2020-05-25 11:52:48 -0700
commitb271aeffa25c53f3750f58ad6209f3fa7c528716 (patch)
treee2d85c56570965e26803b629502e9bcb7efa648d /ports/bond
parent2ac2b5f3da6b46ff2ae900550bd7c44f39c57dcd (diff)
downloadvcpkg-b271aeffa25c53f3750f58ad6209f3fa7c528716.tar.gz
vcpkg-b271aeffa25c53f3750f58ad6209f3fa7c528716.zip
[VCPKG baseline] Fix many ports (#11559)
Diffstat (limited to 'ports/bond')
-rw-r--r--ports/bond/CONTROL2
-rw-r--r--ports/bond/portfile.cmake11
2 files changed, 5 insertions, 8 deletions
diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL
index 9a6e00f6d..b0a2a9a75 100644
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@@ -1,5 +1,5 @@
Source: bond
-Version: 8.1.0-3
+Version: 8.1.0-4
Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
Homepage: https://github.com/Microsoft/bond
Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake
index f21d2e7f8..47e2b782d 100644
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -11,7 +9,7 @@ vcpkg_from_github(
PATCHES fix-install-path.patch
)
-if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_download_distfile(GBC_ARCHIVE
URLS "https://github.com/microsoft/bond/releases/download/8.1.0/gbc-8.1.0-amd64.zip"
FILENAME "gbc-8.1.0-amd64.zip"
@@ -50,13 +48,12 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/bond TARGET_PATH share/bond)
-# Put the license file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bond)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/bond/LICENSE ${CURRENT_PACKAGES_DIR}/share/bond/copyright)
+vcpkg_copy_pdbs()
# There's no way to supress installation of the headers in the debug build,
# so we just delete them.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-vcpkg_copy_pdbs()
+# Put the license file where vcpkg expects it
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)