Skip to content

Commit

Permalink
Fix usage of M_PI on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
traversaro authored Feb 11, 2024
1 parent e0491ba commit d8dc189
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions joint_trajectory_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,15 @@ if(BUILD_TESTING)

ament_add_gmock(test_trajectory test/test_trajectory.cpp)
target_link_libraries(test_trajectory joint_trajectory_controller)
target_compile_definitions(test_trajectory PRIVATE _USE_MATH_DEFINES)

ament_add_gmock(test_trajectory_controller
test/test_trajectory_controller.cpp)
set_tests_properties(test_trajectory_controller PROPERTIES TIMEOUT 220)
target_link_libraries(test_trajectory_controller
joint_trajectory_controller
)
target_compile_definitions(joint_trajectory_controller PRIVATE _USE_MATH_DEFINES)

ament_add_gmock(test_load_joint_trajectory_controller
test/test_load_joint_trajectory_controller.cpp
Expand Down
2 changes: 1 addition & 1 deletion steering_controllers_library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ament_target_dependencies(steering_controllers_library PUBLIC ${THIS_PACKAGE_INC

# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(steering_controllers_library PRIVATE "STEERING_CONTROLLERS_BUILDING_DLL")
target_compile_definitions(steering_controllers_library PRIVATE "STEERING_CONTROLLERS_BUILDING_DLL" "_USE_MATH_DEFINES")

if(BUILD_TESTING)
find_package(ament_cmake_gmock REQUIRED)
Expand Down
1 change: 1 addition & 0 deletions tricycle_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ target_include_directories(tricycle_controller PUBLIC
)
target_link_libraries(tricycle_controller PUBLIC tricycle_controller_parameters)
ament_target_dependencies(tricycle_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
target_compile_definitions(tricycle_controller PRIVATE _USE_MATH_DEFINES)

pluginlib_export_plugin_description_file(controller_interface tricycle_controller.xml)

Expand Down

0 comments on commit d8dc189

Please sign in to comment.