Skip to content

Commit 6027aaf

Browse files
Use auto dependency management for windows workflow (#1917)
1 parent d893231 commit 6027aaf

File tree

3 files changed

+13
-48
lines changed

3 files changed

+13
-48
lines changed

.github/workflows/rolling-semi-binary-build-win.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ on:
1616
- '**/package.xml'
1717
- '**/CMakeLists.txt'
1818
- 'ros2_controllers.rolling.repos'
19-
- 'ros2_controllers.windows.rolling.repos'
2019
push:
2120
branches:
2221
- master
@@ -29,7 +28,6 @@ on:
2928
- '**/package.xml'
3029
- '**/CMakeLists.txt'
3130
- 'ros2_controllers.rolling.repos'
32-
- 'ros2_controllers.windows.rolling.repos'
3331

3432
concurrency:
3533
# cancel previous runs of the same workflow, except for pushes on given branches
@@ -42,7 +40,5 @@ jobs:
4240
with:
4341
ros_distro: rolling
4442
pixi_dependencies: typeguard jinja2 boost compilers
45-
windows_dependencies: ros2_controllers.windows.rolling.repos
4643
ninja_packages: rsl
47-
skip_packages: diagnostic_remote_logging generate_parameter_library_example_external generate_parameter_library_example
4844
target_cmake_args: -DBUILD_TESTING=OFF

joint_trajectory_controller/CMakeLists.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ add_library(joint_trajectory_controller SHARED
3838
src/trajectory.cpp
3939
)
4040
target_compile_features(joint_trajectory_controller PUBLIC cxx_std_17)
41+
if(WIN32)
42+
target_compile_definitions(joint_trajectory_controller PRIVATE _USE_MATH_DEFINES)
43+
endif()
4144
target_include_directories(joint_trajectory_controller PUBLIC
4245
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
4346
$<INSTALL_INTERFACE:include/joint_trajectory_controller>
@@ -66,23 +69,26 @@ if(BUILD_TESTING)
6669
find_package(ros2_control_test_assets REQUIRED)
6770

6871
ament_add_gmock(test_trajectory test/test_trajectory.cpp)
69-
target_link_libraries(test_trajectory joint_trajectory_controller)
70-
target_link_libraries(test_trajectory ros2_control_test_assets::ros2_control_test_assets)
72+
target_link_libraries(test_trajectory
73+
joint_trajectory_controller
74+
ros2_control_test_assets::ros2_control_test_assets
75+
)
7176
target_compile_definitions(test_trajectory PRIVATE _USE_MATH_DEFINES)
7277

7378
ament_add_gmock(test_tolerances test/test_tolerances.cpp)
74-
target_link_libraries(test_tolerances joint_trajectory_controller)
75-
target_link_libraries(test_tolerances ros2_control_test_assets::ros2_control_test_assets)
76-
target_compile_definitions(test_tolerances PRIVATE _USE_MATH_DEFINES)
79+
target_link_libraries(test_tolerances
80+
joint_trajectory_controller
81+
ros2_control_test_assets::ros2_control_test_assets
82+
)
7783

7884
ament_add_gmock(test_trajectory_controller
7985
test/test_trajectory_controller.cpp)
8086
set_tests_properties(test_trajectory_controller PROPERTIES TIMEOUT 220)
8187
target_link_libraries(test_trajectory_controller
8288
joint_trajectory_controller
89+
ros2_control_test_assets::ros2_control_test_assets
8390
)
84-
target_link_libraries(test_trajectory_controller ros2_control_test_assets::ros2_control_test_assets)
85-
target_compile_definitions(joint_trajectory_controller PRIVATE _USE_MATH_DEFINES)
91+
target_compile_definitions(test_trajectory_controller PRIVATE _USE_MATH_DEFINES)
8692

8793
add_definitions(-DTEST_FILES_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/test")
8894
ament_add_gmock(test_load_joint_trajectory_controller

ros2_controllers.windows.rolling.repos

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)