diff options
| author | Park DongHa <luncliff@gmail.com> | 2021-03-25 04:45:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 12:45:42 -0700 |
| commit | e37bd3f12f140b9412675af1ab8eb66cd94093d6 (patch) | |
| tree | 406484ddc33923ab5b593831a7add059ee64af91 | |
| parent | 2de2ed68fd2b2f5c69ee3fcf2ed0daba5059be26 (diff) | |
| download | vcpkg-e37bd3f12f140b9412675af1ab8eb66cd94093d6.tar.gz vcpkg-e37bd3f12f140b9412675af1ab8eb66cd94093d6.zip | |
[flatbuffers] support iOS triplets (#16843)
* [flatbuffers] exclude 'flatc' for ios triplets
* building flatc requires BUNDLE DESTINATION
* increase port version
* [flatbuffers] increase port version
* [flatbuffers] fix git-tree SHA
| -rw-r--r-- | ports/flatbuffers/CONTROL | 2 | ||||
| -rw-r--r-- | ports/flatbuffers/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/flatbuffers.json | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 8f565b25f..ced25eb94 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -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/ diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index 1a3c6f835..794592d98 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -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() @@ -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) diff --git a/versions/baseline.json b/versions/baseline.json index d4be09b29..c36debd27 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1966,7 +1966,7 @@ }, "flatbuffers": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 2 }, "flint": { "baseline": "2.5.2-4", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 3bc772365..106b1d8ca 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "195ffbf0b3c6abace9106115fd4ed081431a3997", + "version-string": "1.12.0", + "port-version": 2 + }, + { "git-tree": "cb19f0b4ccf3b910c2dab457cfb05f190ae092b3", "version-string": "1.12.0", "port-version": 1 |