diff options
| author | Code Hz <codehz@users.noreply.github.com> | 2020-04-17 04:30:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 13:30:13 -0700 |
| commit | 4ff057d5ba15ca7a8240acc2ba1f68256c9974da (patch) | |
| tree | 12735ddc11e9f0e5834e5a548e73b2988f8ed058 | |
| parent | 8fb29061f4a370aa10913a8a4442215adc14e924 (diff) | |
| download | vcpkg-4ff057d5ba15ca7a8240acc2ba1f68256c9974da.tar.gz vcpkg-4ff057d5ba15ca7a8240acc2ba1f68256c9974da.zip | |
[flatbuffers] Update to 1.12.0 (#10664)
* [flatbuffers] Update to 1.12.0
* remove deprecated
* Bump version
* update the revision
| -rw-r--r-- | ports/flatbuffers/CONTROL | 2 | ||||
| -rw-r--r-- | ports/flatbuffers/fix-uwp-build.patch | 10 | ||||
| -rw-r--r-- | ports/flatbuffers/portfile.cmake | 11 |
3 files changed, 10 insertions, 13 deletions
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 3baf26b02..5433a0598 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,5 +1,5 @@ Source: flatbuffers -Version: 1.11.0-1 +Version: 1.12.0 Description: Memory Efficient Serialization Library FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. Homepage: https://google.github.io/flatbuffers/ diff --git a/ports/flatbuffers/fix-uwp-build.patch b/ports/flatbuffers/fix-uwp-build.patch index 7d8fe93a3..5716f8a2f 100644 --- a/ports/flatbuffers/fix-uwp-build.patch +++ b/ports/flatbuffers/fix-uwp-build.patch @@ -2,11 +2,11 @@ diff --git a/src/util.cpp b/src/util.cpp index c1bb197..658e116 100644 --- a/src/util.cpp +++ b/src/util.cpp -@@ -239,9 +239,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) { - #ifdef _MSC_VER - __pragma(warning(disable : 4996)); // _CRT_SECURE_NO_WARNINGS - #endif -+#if _WIN32_WINNT < 0x0A00 +@@ -245,9 +245,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) { + #ifdef _MSC_VER + __pragma(warning(disable : 4996)); // _CRT_SECURE_NO_WARNINGS + #endif ++#if _WIN32_WINNT < 0x0A00 auto env_str = std::getenv(var_name); if (!env_str) return false; if (_value) *_value = std::string(env_str); diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index c619ac9ee..1c3cf665b 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -1,12 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers - REF v1.11.0 - SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe + REF v1.12.0 + SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063 HEAD_REF master PATCHES ignore_use_of_cmake_toolchain_file.patch @@ -15,7 +13,7 @@ vcpkg_from_github( ) set(OPTIONS) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF) endif() @@ -47,5 +45,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/flatbuffers) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/flatbuffers/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/flatbuffers/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |