Skip to content
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

Remove boilerplate visibility macros #1972

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+41 −575
Open

Remove boilerplate visibility macros #1972

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d581bde
Remove visibility macros files
bmagyar Dec 23, 2024
1a8a974
Remove the use of visibility macros
bmagyar Dec 23, 2024
93b4b7f
Add windows visibility export option
bmagyar Dec 23, 2024
4ed7868
Remove all dllexport target compile defs ending in _BUILDING_DLL
bmagyar Dec 23, 2024
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
3 changes: 0 additions & 3 deletions controller_interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ target_include_directories(controller_interface PUBLIC
$<INSTALL_INTERFACE:include/controller_interface>
)
ament_target_dependencies(controller_interface PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(controller_interface PRIVATE "CONTROLLER_INTERFACE_BUILDING_DLL")

if(BUILD_TESTING)
find_package(ament_cmake_gmock REQUIRED)
Expand Down
46 changes: 0 additions & 46 deletions controller_interface/cmake/controller_interface_configure_controller_library.cmake
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we first deprecate this for one release cycle?

This file was deleted.

8 changes: 0 additions & 8 deletions controller_manager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ target_link_libraries(controller_manager PUBLIC
)
ament_target_dependencies(controller_manager PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})

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

add_executable(ros2_control_node src/ros2_control_node.cpp)
target_link_libraries(ros2_control_node PRIVATE
controller_manager
Expand All @@ -68,7 +64,6 @@ if(BUILD_TESTING)
add_library(test_controller SHARED test/test_controller/test_controller.cpp)
target_link_libraries(test_controller PUBLIC controller_manager)
ament_target_dependencies(test_controller PUBLIC example_interfaces)
target_compile_definitions(test_controller PRIVATE "CONTROLLER_MANAGER_BUILDING_DLL")
pluginlib_export_plugin_description_file(controller_interface test/test_controller/test_controller.xml)
install(
TARGETS test_controller
Expand All @@ -79,7 +74,6 @@ if(BUILD_TESTING)
test/test_controller_failed_init/test_controller_failed_init.cpp
)
target_link_libraries(test_controller_failed_init PUBLIC controller_manager)
target_compile_definitions(test_controller_failed_init PRIVATE "CONTROLLER_MANAGER_BUILDING_DLL")
pluginlib_export_plugin_description_file(
controller_interface test/test_controller_failed_init/test_controller_failed_init.xml)
install(
Expand All @@ -92,7 +86,6 @@ if(BUILD_TESTING)
)
ament_target_dependencies(test_chainable_controller PUBLIC realtime_tools)
target_link_libraries(test_chainable_controller PUBLIC controller_manager)
target_compile_definitions(test_chainable_controller PRIVATE "CONTROLLER_MANAGER_BUILDING_DLL")
pluginlib_export_plugin_description_file(
controller_interface test/test_chainable_controller/test_chainable_controller.xml)
install(
Expand Down Expand Up @@ -182,7 +175,6 @@ if(BUILD_TESTING)
target_link_libraries(test_controller_with_interfaces PUBLIC
controller_manager
)
target_compile_definitions(test_controller_with_interfaces PRIVATE "CONTROLLER_MANAGER_BUILDING_DLL")
pluginlib_export_plugin_description_file(
controller_interface test/test_controller_with_interfaces/test_controller_with_interfaces.xml)
install(
Expand Down
6 changes: 0 additions & 6 deletions hardware_interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ target_include_directories(hardware_interface PUBLIC
$<INSTALL_INTERFACE:include/hardware_interface>
)
ament_target_dependencies(hardware_interface PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(hardware_interface PRIVATE "HARDWARE_INTERFACE_BUILDING_DLL")

add_library(mock_components SHARED
src/mock_components/generic_system.cpp
Expand All @@ -58,9 +55,6 @@ target_include_directories(mock_components PUBLIC
$<INSTALL_INTERFACE:include/hardware_interface>
)
ament_target_dependencies(mock_components PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(mock_components PRIVATE "HARDWARE_INTERFACE_BUILDING_DLL")

pluginlib_export_plugin_description_file(
hardware_interface mock_components_plugin_description.xml)
Expand Down
7 changes: 0 additions & 7 deletions joint_limits/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ target_include_directories(joint_limiter_interface PUBLIC
$<INSTALL_INTERFACE:include/joint_limits>
)
ament_target_dependencies(joint_limiter_interface PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(joint_limiter_interface PRIVATE "JOINT_LIMITS_BUILDING_DLL")


add_library(joint_saturation_limiter SHARED
src/joint_saturation_limiter.cpp
Expand All @@ -57,9 +53,6 @@ target_include_directories(joint_saturation_limiter PUBLIC
$<INSTALL_INTERFACE:include/joint_limits>
)
ament_target_dependencies(joint_saturation_limiter PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(joint_saturation_limiter PRIVATE "JOINT_LIMITS_BUILDING_DLL")

pluginlib_export_plugin_description_file(joint_limits joint_limiters.xml)

Expand Down
Loading