Skip to content

Test if cpp-expected works for windows #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
christophfroehlich wants to merge 13 commits into from
Closed

Test if cpp-expected works for windows #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
598ba65
Test if cpp-expected works for windows
christophfroehlich Feb 28, 2026
e5efa59
Fix cmake
christophfroehlich Feb 28, 2026
514192b
TEMP: use ros2_control_ci dev branch
christophfroehlich Feb 28, 2026
68deb06
Set RSL_BUILD_TESTING=ON
christophfroehlich Feb 28, 2026
10b4e21
Fix rsl-config.cmake
christophfroehlich Feb 28, 2026
46dd023
Build the tests also with the ros CI
christophfroehlich Feb 28, 2026
660364d
Install range-v3
christophfroehlich Feb 28, 2026
5c4255f
Revert "TEMP: use ros2_control_ci dev branch"
christophfroehlich Feb 28, 2026
4efdef8
Make output cross-platform compatible
christophfroehlich Feb 28, 2026
53903f3
Fix test on windows
christophfroehlich Feb 28, 2026
cd8db51
Also fix one_of output
christophfroehlich Feb 28, 2026
55e2d2f
Cleanup win build
christophfroehlich Feb 28, 2026
d6b976c
Merge branch 'main' into test/win
christophfroehlich Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rolling-win-binary-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)")
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/rsl-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion include/rsl/monad.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <tl_expected/expected.hpp>
#include <tl/expected.hpp>

#include <optional>

Expand Down
2 changes: 1 addition & 1 deletion include/rsl/parameter_validators.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <rcl_interfaces/msg/set_parameters_result.hpp>
#include <rclcpp/parameter.hpp>
#include <tl_expected/expected.hpp>
#include <tl/expected.hpp>

#include <fmt/ranges.h>
#include <type_traits>
Expand Down
2 changes: 1 addition & 1 deletion include/rsl/try.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <tl_expected/expected.hpp>
#include <tl/expected.hpp>

/** @file */

Expand Down
2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<depend>fmt</depend>
<depend>rclcpp</depend>
<depend>tcb_span</depend>
<depend>tl_expected</depend>
<depend>libexpected-dev</depend>

<test_depend>ament_cmake_ros</test_depend>
<test_depend>clang-tidy</test_depend>
Expand Down
Loading