Skip to content

Commit f672af7

Browse files
Use libexpected-dev instead of tl_expected (#322)
1 parent 012fd79 commit f672af7

5 files changed

Lines changed: 23 additions & 3 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Here is an example custom validator.
296296
#include <rclcpp/rclcpp.hpp>
297297
298298
#include <fmt/core.h>
299-
#include <tl_expected/expected.hpp>
299+
#include <tl/expected.hpp>
300300
301301
namespace my_project {
302302

example/include/generate_parameter_library_example/example_validators.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <string>
3434

3535
#include <rclcpp/rclcpp.hpp>
36-
#include <tl_expected/expected.hpp>
36+
#include <tl/expected.hpp>
3737

3838
namespace custom_validators {
3939

generate_parameter_library/cmake/generate_parameter_library.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,21 @@ macro(generate_parameter_library LIB_NAME YAML_FILE)
9696
rclcpp_lifecycle::rclcpp_lifecycle
9797
rsl::rsl
9898
tcb_span::tcb_span
99+
tl::expected
100+
# for backward compatibility
101+
# remove once this redirection is removed
102+
# https://github.com/PickNikRobotics/cpp_polyfills/pull/12
99103
tl_expected::tl_expected
100104
)
101105
install(DIRECTORY ${LIB_INCLUDE_DIR} DESTINATION include)
102-
ament_export_dependencies(fmt parameter_traits rclcpp rclcpp_lifecycle rsl tcb_span tl_expected)
106+
ament_export_dependencies(
107+
fmt parameter_traits rclcpp rclcpp_lifecycle rsl tcb_span
108+
tl-expected
109+
# for backward compatibility
110+
# remove once this redirection is removed
111+
# https://github.com/PickNikRobotics/cpp_polyfills/pull/12
112+
tl_expected
113+
)
103114
endmacro()
104115

105116

generate_parameter_library/generate_parameter_library-extras.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ find_package(rclcpp REQUIRED)
3232
find_package(rsl REQUIRED)
3333
find_package(rclcpp_lifecycle REQUIRED)
3434
find_package(tcb_span REQUIRED)
35+
find_package(tl-expected REQUIRED)
36+
# for backward compatibility
37+
# remove once this redirection is removed
38+
# https://github.com/PickNikRobotics/cpp_polyfills/pull/12
3539
find_package(tl_expected REQUIRED)
3640

3741
include("${generate_parameter_library_DIR}/generate_parameter_library.cmake")

generate_parameter_library/package.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<depend>rclcpp_lifecycle</depend>
2525
<depend>rsl</depend>
2626
<depend>tcb_span</depend>
27+
<depend>libexpected-dev</depend>
28+
29+
<!-- for backward compatibility -->
30+
<!-- remove once this redirection is removed -->
31+
<!-- https://github.com/PickNikRobotics/cpp_polyfills/pull/12 -->
2732
<depend>tl_expected</depend>
2833

2934
<export>

0 commit comments

Comments
 (0)