Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[flatbuffers] support iOS triplets #16843

Merged
merged 4 commits into from
Mar 24, 2021
Merged

[flatbuffers] support iOS triplets #16843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46aab41
[flatbuffers] exclude 'flatc' for ios triplets
luncliff Mar 23, 2021
935808e
Merge branch 'master' into port/flatbuffers
luncliff Mar 24, 2021
67fd5c1
[flatbuffers] increase port version
luncliff Mar 24, 2021
76af108
[flatbuffers] fix git-tree SHA
luncliff Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/flatbuffers/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: flatbuffers
Version: 1.12.0
Port-Version: 1
Port-Version: 2
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/
4 changes: 2 additions & 2 deletions ports/flatbuffers/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ vcpkg_from_github(
)

set(OPTIONS)
if(VCPKG_TARGET_IS_UWP)
if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_IOS)
list(APPEND OPTIONS -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF)
endif()

Expand All @@ -40,7 +40,7 @@ if(flatc_path)
${flatc_path}
${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable}
)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
endif()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,7 +1966,7 @@
},
"flatbuffers": {
"baseline": "1.12.0",
"port-version": 1
"port-version": 2
},
"flint": {
"baseline": "2.5.2-4",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/flatbuffers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "195ffbf0b3c6abace9106115fd4ed081431a3997",
"version-string": "1.12.0",
"port-version": 2
},
{
"git-tree": "cb19f0b4ccf3b910c2dab457cfb05f190ae092b3",
"version-string": "1.12.0",
Expand Down