aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-07-18 17:07:12 -0700
committerGitHub <noreply@github.com>2017-07-18 17:07:12 -0700
commit79ae8b04fc436be14dcf690dbca39b1c483fa992 (patch)
tree37cb3bdbed28ad9404777475daaa412b45bce65b
parent1c69aafd15585a1a6562ffe96184bfe21fcb8124 (diff)
parent4c8f8b3840acfd187110e517a1e2a8d44db48da8 (diff)
downloadvcpkg-79ae8b04fc436be14dcf690dbca39b1c483fa992.tar.gz
vcpkg-79ae8b04fc436be14dcf690dbca39b1c483fa992.zip
Merge pull request #1486 from codicodi/flatbuffers-1.7.1
[flatbuffers] update to 1.7.1
-rw-r--r--ports/flatbuffers/CONTROL2
-rw-r--r--ports/flatbuffers/portfile.cmake14
2 files changed, 7 insertions, 9 deletions
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL
index 1fbe5d628..e68024e91 100644
--- a/ports/flatbuffers/CONTROL
+++ b/ports/flatbuffers/CONTROL
@@ -1,4 +1,4 @@
Source: flatbuffers
-Version: 1.6.0
+Version: 1.7.1
Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/
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. \ No newline at end of file
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index e2c05d2c0..b785e2fc5 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -11,15 +11,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
-
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flatbuffers-1.6.0)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/google/flatbuffers/archive/v1.6.0.zip"
- FILENAME "flatbuffers-1.6.0.zip"
- SHA512 c23043a54d7055f4e0a0164fdafd3f1d60292e57d62d20d30f641c9da90935d14da847f86239a19f777e68b707cfb25452da9192607a3a399ab25ce06b31c282
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO google/flatbuffers
+ REF v1.7.1
+ SHA512 57732fc352c216c4be6d3237f93b872abf9dd2b62361d7d2856f99804a178760e4665ead2e33d5acdd00984ad03a746f581c9784ece583e1b2df1a10776f967a
+ HEAD_REF master
)
-vcpkg_extract_source_archive(${ARCHIVE})
set(OPTIONS)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -37,7 +36,6 @@ vcpkg_configure_cmake(
# OPTIONS_DEBUG -DDEBUGGABLE=1
)
-vcpkg_build_cmake()
vcpkg_install_cmake()
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin)