diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/console-bridge | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/console-bridge')
| -rw-r--r-- | ports/console-bridge/CONTROL | 2 | ||||
| -rw-r--r-- | ports/console-bridge/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/console-bridge/static-macro.patch | 15 |
3 files changed, 1 insertions, 17 deletions
diff --git a/ports/console-bridge/CONTROL b/ports/console-bridge/CONTROL index b41d031b5..550d9a5bf 100644 --- a/ports/console-bridge/CONTROL +++ b/ports/console-bridge/CONTROL @@ -1,4 +1,4 @@ Source: console-bridge -Version: 0.4.3-1 +Version: 0.4.3-2 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 231a412c8..7f0ce34fd 100644 --- a/ports/console-bridge/portfile.cmake +++ b/ports/console-bridge/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( REF f0b423c0c2d02651db1776c96887c0a314908063 SHA512 f022341f06c4edf564b94305b7ce279a7a2a61d0323a7ccf374598011909d86b0a9c514b4d41fd1d523baecc1c320d16a931a8f0fbb3a3e4950720f84f0472e6 HEAD_REF master - PATCHES static-macro.patch ) vcpkg_configure_cmake( diff --git a/ports/console-bridge/static-macro.patch b/ports/console-bridge/static-macro.patch deleted file mode 100644 index 31e4053aa..000000000 --- a/ports/console-bridge/static-macro.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 604b2ab..e98b51c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,10 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
- option(BUILD_SHARED_LIBS "Build dynamically-linked binaries" ON)
- endif()
-
-+if(NOT BUILD_SHARED_LIBS)
-+ add_definitions(-DCONSOLE_BRIDGE_STATIC)
-+endif()
-+
- add_library(${PROJECT_NAME} src/console.cpp)
- set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION
- ${CONSOLE_BRIDGE_MAJOR_VERSION}.${CONSOLE_BRIDGE_MINOR_VERSION})
|