diff options
| author | Silvio Traversaro <silvio.traversaro@iit.it> | 2020-11-25 20:23:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 11:23:22 -0800 |
| commit | e81a56708035a7612127d6152d16bf863b29df78 (patch) | |
| tree | a865f9b4f9b1b96a582a92919d65a35435d3b13a /ports/ignition-msgs5 | |
| parent | c961c13692df3d12a874058fd1b10d0902282b00 (diff) | |
| download | vcpkg-e81a56708035a7612127d6152d16bf863b29df78.tar.gz vcpkg-e81a56708035a7612127d6152d16bf863b29df78.zip | |
[ignition-msgs*] Fix flaky CI tests for ignition-msgs* ports (#14730)
Pass ADD_BIN_TO_PATH to vcpkg_install_cmake and
remove custom PATH hacks.
Diffstat (limited to 'ports/ignition-msgs5')
| -rw-r--r-- | ports/ignition-msgs5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ignition-msgs5/portfile.cmake | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/ports/ignition-msgs5/CONTROL b/ports/ignition-msgs5/CONTROL index b1317303b..c9f357b49 100644 --- a/ports/ignition-msgs5/CONTROL +++ b/ports/ignition-msgs5/CONTROL @@ -1,6 +1,6 @@ Source: ignition-msgs5 Version: 5.3.0 -Port-Version: 1 +Port-Version: 2 Build-Depends: ignition-modularscripts, ignition-cmake2, ignition-math6, protobuf, tinyxml2 Description: Middleware protobuf messages for robotics Supports: !(arm|uwp)
\ No newline at end of file diff --git a/ports/ignition-msgs5/portfile.cmake b/ports/ignition-msgs5/portfile.cmake index 1174cb906..ea5458590 100644 --- a/ports/ignition-msgs5/portfile.cmake +++ b/ports/ignition-msgs5/portfile.cmake @@ -4,17 +4,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) -# This port needs to generate protobuf messages with a custom plugin generator, -# so it needs to have in Windows the relative protobuf dll available in the PATH -set(path_backup $ENV{PATH}) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) -vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin) - ignition_modular_library(NAME msgs VERSION "5.3.0" SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e PATCHES "01-protobuf.patch") -# Restore old path -set(ENV{PATH} "${path_backup}") |