diff --git a/.github/workflows/rolling-win-binary-build.yml b/.github/workflows/rolling-win-binary-build.yml index 75524c5..1a399de 100644 --- a/.github/workflows/rolling-win-binary-build.yml +++ b/.github/workflows/rolling-win-binary-build.yml @@ -21,6 +21,6 @@ jobs: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master with: ros_distro: rolling - pixi_dependencies: jinja2 compilers range-v3 + pixi_dependencies: jinja2 compilers cpp-expected range-v3 ninja_packages: rsl target_cmake_args: -DRSL_BUILD_TESTING=ON diff --git a/CMakeLists.txt b/CMakeLists.txt index 6413fb0..a76718f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(Eigen3 REQUIRED CONFIG) find_package(fmt REQUIRED) find_package(rclcpp REQUIRED) find_package(tcb_span REQUIRED) -find_package(tl_expected REQUIRED) +find_package(tl-expected REQUIRED) option(RSL_ENABLE_WARNINGS "Enable compiler warnings" OFF) if(RSL_ENABLE_WARNINGS AND CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") @@ -32,7 +32,7 @@ target_link_libraries(rsl PUBLIC fmt::fmt rclcpp::rclcpp tcb_span::tcb_span - tl_expected::tl_expected + tl::expected ) set_target_properties(rsl PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN YES) generate_export_header(rsl EXPORT_FILE_NAME include/rsl/export.hpp) diff --git a/cmake/rsl-config.cmake b/cmake/rsl-config.cmake index 4f0b3c8..b8a94cf 100644 --- a/cmake/rsl-config.cmake +++ b/cmake/rsl-config.cmake @@ -4,7 +4,7 @@ find_dependency(Eigen3 CONFIG) find_dependency(fmt) find_dependency(rclcpp) find_dependency(tcb_span) -find_dependency(tl_expected) +find_dependency(tl-expected) include(${CMAKE_CURRENT_LIST_DIR}/rsl-targets.cmake) diff --git a/include/rsl/monad.hpp b/include/rsl/monad.hpp index 6227aed..d22eb42 100644 --- a/include/rsl/monad.hpp +++ b/include/rsl/monad.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/include/rsl/parameter_validators.hpp b/include/rsl/parameter_validators.hpp index a52b57c..b1fd52f 100644 --- a/include/rsl/parameter_validators.hpp +++ b/include/rsl/parameter_validators.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/include/rsl/try.hpp b/include/rsl/try.hpp index cf60454..51980a6 100644 --- a/include/rsl/try.hpp +++ b/include/rsl/try.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include /** @file */ diff --git a/package.xml b/package.xml index 94a3f34..b86bfbd 100644 --- a/package.xml +++ b/package.xml @@ -18,7 +18,7 @@ fmt rclcpp tcb_span - tl_expected + libexpected-dev ament_cmake_ros clang-tidy