mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 11:07:10 +01:00
Upgrade Bond to 5.3.1
* Updated to the 5.3.1 release of Bond. * Removed now-redundant 0003_rename_gbc_during_install.patch. * Regenerated other patches.
This commit is contained in:
parent
13d6e660a3
commit
e8c4f36b87
@ -1,17 +1,17 @@
|
||||
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
|
||||
index ed225d14..1573c915 100644
|
||||
index c6e2b40d..d8b4d689 100644
|
||||
--- a/cmake/Config.cmake
|
||||
+++ b/cmake/Config.cmake
|
||||
@@ -19,7 +19,7 @@ if (MSVC)
|
||||
# disable MSVC warnings
|
||||
add_compile_options (/bigobj /FIbond/core/warning.h /W4 /WX)
|
||||
add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
|
||||
@@ -35,7 +35,7 @@ if (MSVC)
|
||||
# Bond with MSVC CRT-specific code too much. More details at
|
||||
# https://msdn.microsoft.com/en-us/library/ms175759.aspx
|
||||
add_definitions (-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1)
|
||||
- set (Boost_USE_STATIC_LIBS ON)
|
||||
+ set (Boost_USE_STATIC_LIBS OFF)
|
||||
endif (MSVC)
|
||||
|
||||
if (WIN32)
|
||||
@@ -90,9 +90,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++"))
|
||||
@@ -106,9 +106,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++"))
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0d743da4..92f91103 100644
|
||||
index 72d62c5e..d7eb5cd4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -39,7 +39,6 @@ install (DIRECTORY
|
||||
|
@ -1,22 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0d743da4..72d62c5e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -49,7 +49,14 @@ install (EXPORT bond
|
||||
|
||||
# if BOND_GBC_PATH is set we must copy over that gbc to the install location
|
||||
if (BOND_GBC_PATH)
|
||||
- install (FILES
|
||||
- ${BOND_GBC_PATH}
|
||||
- DESTINATION bin)
|
||||
+ if (WIN32)
|
||||
+ set(INSTALLED_GBC_NAME gbc.exe)
|
||||
+ else()
|
||||
+ set(INSTALLED_GBC_NAME gbc)
|
||||
+ endif()
|
||||
+
|
||||
+ install (
|
||||
+ FILES ${BOND_GBC_PATH}
|
||||
+ DESTINATION bin
|
||||
+ RENAME ${INSTALLED_GBC_NAME})
|
||||
endif()
|
@ -1,5 +1,5 @@
|
||||
Source: bond
|
||||
Maintainer: bond@microsoft.com
|
||||
Version: 5.2.0
|
||||
Version: 5.3.1
|
||||
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. <https://github.com/Microsoft/bond>
|
||||
Build-Depends: boost, rapidjson
|
||||
|
@ -4,24 +4,24 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
endif()
|
||||
|
||||
include(vcpkg_common_functions)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-5.2.0)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-5.3.1)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://github.com/Microsoft/bond/archive/5.2.0.zip"
|
||||
FILENAME "bond-5.2.0.zip"
|
||||
SHA512 bc533d9e7431d0690b555aa4a42ca947f8025fc388f698c40cfeacf4286892ac5fd86d93df187009d4791e3eae240eb60886947cfe600838c6058274eb4d625c
|
||||
URLS "https://github.com/Microsoft/bond/archive/5.3.1.zip"
|
||||
FILENAME "bond-5.3.1.zip"
|
||||
SHA512 aa1b3b6cbbbfbdb450306b59d0216c4b63b25ce2f5852387b42cb5c098e8fb6f90d8d1f688344fa4375244510009767d7d46a6a0b5f49c725b22cf3e9d73d1e5
|
||||
)
|
||||
vcpkg_download_distfile(GBC_ARCHIVE
|
||||
URLS "https://github.com/Microsoft/bond/releases/download/5.2.0/gbc-5.2.0-amd64.zip"
|
||||
FILENAME "gbc-5.2.0-amd64.zip"
|
||||
SHA512 9413c0035939788724e08ac858bfc3b2ccefbba74ed737b22eca35ec0da576aa2bf8403e606d2ac20b3fbc827933c289630266824613e04b1921b66fef00e132
|
||||
URLS "https://github.com/Microsoft/bond/releases/download/5.3.1/gbc-5.3.1-amd64.exe.zip"
|
||||
FILENAME "gbc-5.3.1-amd64.zip"
|
||||
SHA512 fb1eff0b7bd34cba26fa6a0ffeba7789cff55976e95a695aa2cf6ae60b5c4e8b0dd15f0d7968599bd5b17c9b8b325aa29e3e13aca4854ec38ed50253d67038e4
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
# Extract the precompiled gbc
|
||||
vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
|
||||
set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-5.2.0-amd64.exe)
|
||||
set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-5.3.1-amd64.exe)
|
||||
|
||||
if (NOT EXISTS ${FETCHED_GBC_PATH})
|
||||
message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
|
||||
@ -36,9 +36,6 @@ vcpkg_apply_patches(
|
||||
# Don't install rapidjson from the (empty) submodule. With vcpkg, we get
|
||||
# rapidjson from vcpkg
|
||||
${CMAKE_CURRENT_LIST_DIR}/0002_omit_rapidjson.patch
|
||||
# Temporary until this is committed upstream. See
|
||||
# https://github.com/Microsoft/bond/pull/324 for details.
|
||||
${CMAKE_CURRENT_LIST_DIR}/0003_rename_gbc_during_install.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
Loading…
x
Reference in New Issue
Block a user