diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2021-05-06 07:12:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 07:12:43 -0700 |
| commit | 4e83da08875f8d0f051101d2a42e1171b4001b38 (patch) | |
| tree | aabe1af4d644e9a05b7004f3dea385542b9d4a6a /ports | |
| parent | 4ef97c2c33275d7b763e3f5b3308f4bead0a0b08 (diff) | |
| download | vcpkg-4e83da08875f8d0f051101d2a42e1171b4001b38.tar.gz vcpkg-4e83da08875f8d0f051101d2a42e1171b4001b38.zip | |
[vcpkg] Update vcpkg tool version 2021-05-05 (#17689)
* [vcpkg] Update vcpkg tool version 2021-05-05
* [vcpkg] Hotfix bug in Microsoft/vcpkg-tool#34
* [vcpkg-ci] Ignore results from non-target triplets
* [protobuf] Fix regression introduced in #16904
* [vcpkg] Fix bug where 'staticcrt' was ignored
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/liblsl/CONTROL | 3 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/protobuf/vcpkg.json | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL index 708ea67e1..1433bf143 100644 --- a/ports/liblsl/CONTROL +++ b/ports/liblsl/CONTROL @@ -1,6 +1,7 @@ Source: liblsl
Version: 1.14.0
+Port-Version: 1
Homepage: https://github.com/sccn/liblsl
Description: C++ lsl library for multi-modal time-synched data transmission over the local network
-Supports: !(static & staticcrt)
+Supports: !staticcrt
Build-Depends: pugixml
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index a86c2d8a0..939e37096 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -88,6 +88,12 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake "if(protobuf_MODULE_COMPATIBLE)" "if(ON)" ) +if(NOT protobuf_BUILD_LIBPROTOC) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake + "_protobuf_find_libraries(Protobuf_PROTOC protoc)" + "" + ) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 2224b2465..5808add91 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "protobuf", "version-semver": "3.15.8", + "port-version": 1, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ |