Remove all dllexport target compile defs ending in _BUILDING_DLL

ros-controls · Dec 23, 2024 · 4ed7868 · 4ed7868
1 parent 93b4b7f
commit 4ed7868
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 70 deletions.
diff --git a/controller_interface/CMakeLists.txt b/controller_interface/CMakeLists.txt
@@ -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)

diff --git a/controller_interface/cmake/controller_interface_configure_controller_library.cmake b/controller_interface/cmake/controller_interface_configure_controller_library.cmake
diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt
@@ -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
@@ -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
@@ -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(
@@ -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(
@@ -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(

diff --git a/hardware_interface/CMakeLists.txt b/hardware_interface/CMakeLists.txt
@@ -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
@@ -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)

diff --git a/joint_limits/CMakeLists.txt b/joint_limits/CMakeLists.txt
@@ -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
@@ -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)