diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-08-24 13:43:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-24 13:43:57 -0700 |
| commit | 1550b9e71b6ef8530b39db281903edcab73c2e14 (patch) | |
| tree | 91ee3999b75a66f109b72e5da9a647041b9f7f3d /ports/console-bridge | |
| parent | 18a07faca5c8440fb77eb9ec1d76f14841686011 (diff) | |
| download | vcpkg-1550b9e71b6ef8530b39db281903edcab73c2e14.tar.gz vcpkg-1550b9e71b6ef8530b39db281903edcab73c2e14.zip | |
[many ports] Updates 2019.07.09 (#7217)
* [many ports] Upgrades 2019.07.11
* Re-generate patches and fix build errors.
* [manyport]Fix build errors.
* Fix avro-c and console-bridge failures, revert curl and tesseract
* fix botan failure
* Fix build errors and undo some ports upgrades.
* [aws-c-common,chipmunk,cxxopts,grpc]Fix build errors
* Fix build errors.
* [angle]Undo upgrade changes.
* [directxtk]Fix UWP build error (#7233)
* Revert leptonica since it cause tesseract failed
* Revert jsonnet
* [google-cloud-cpp] Disable parallel configure due to source directory writes
* [many ports] Undo undesired changes
* [bitsery] Fix indentation
* [avro-c][aws-c-common][graphite2] Convert line endings to minimize PR diff
* fix console-bridge and remove usockets unused patch
* update ogre patch
* [many ports] Revert unneeded changes w.r.t. master. Add missing write to console-bridge.
* [console-bridge] Fix export macro
* [avro-c] Revert upgrade; split to #7875
* [avro-c] Complete previous revert
Diffstat (limited to 'ports/console-bridge')
| -rw-r--r-- | ports/console-bridge/CONTROL | 2 | ||||
| -rw-r--r-- | ports/console-bridge/portfile.cmake | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/ports/console-bridge/CONTROL b/ports/console-bridge/CONTROL index 47870b72e..b41d031b5 100644 --- a/ports/console-bridge/CONTROL +++ b/ports/console-bridge/CONTROL @@ -1,4 +1,4 @@ Source: console-bridge -Version: 0.3.2-4 +Version: 0.4.3-1 Homepage: https://github.com/ros/console_bridge Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages. diff --git a/ports/console-bridge/portfile.cmake b/ports/console-bridge/portfile.cmake index 8b99e125b..231a412c8 100644 --- a/ports/console-bridge/portfile.cmake +++ b/ports/console-bridge/portfile.cmake @@ -3,14 +3,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/console_bridge - REF 0.3.2 - SHA512 41fa5340d7ba79c887ef73eb4fda7b438ed91febd224934ae4658697e4c9e43357207e1b3e191ecce3c97cb9a87b0556372832735a268261bc798cc7683aa207 + REF f0b423c0c2d02651db1776c96887c0a314908063 + SHA512 f022341f06c4edf564b94305b7ce279a7a2a61d0323a7ccf374598011909d86b0a9c514b4d41fd1d523baecc1c320d16a931a8f0fbb3a3e4950720f84f0472e6 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/static-macro.patch + PATCHES static-macro.patch ) vcpkg_configure_cmake( @@ -36,10 +32,10 @@ string(SUBSTRING "${_contents}" 0 2000 license) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/console-bridge) file(WRITE ${CURRENT_PACKAGES_DIR}/share/console-bridge/copyright "${license}") -file(READ ${CURRENT_PACKAGES_DIR}/include/console_bridge/exportdecl.h _contents) +file(READ ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h _contents) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC" "if 1" _contents "${_contents}") + string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 1" _contents "${_contents}") else() - string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC" "if 0" _contents "${_contents}") + string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 0" _contents "${_contents}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/console_bridge/exportdecl.h "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h "${_contents}") |