diff --git a/example_1/CMakeLists.txt b/example_1/CMakeLists.txt index c2e226908..c322e118d 100644 --- a/example_1/CMakeLists.txt +++ b/example_1/CMakeLists.txt @@ -38,10 +38,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_1_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_1.xml) diff --git a/example_10/CMakeLists.txt b/example_10/CMakeLists.txt index 9343bc8bd..35c1319a9 100644 --- a/example_10/CMakeLists.txt +++ b/example_10/CMakeLists.txt @@ -43,10 +43,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_10_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_10.xml) # Export controllers diff --git a/example_11/CMakeLists.txt b/example_11/CMakeLists.txt index 1c77ee386..83fbf11be 100644 --- a/example_11/CMakeLists.txt +++ b/example_11/CMakeLists.txt @@ -38,10 +38,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_11_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_11.xml) diff --git a/example_12/CMakeLists.txt b/example_12/CMakeLists.txt index 005f4a85d..7652449a9 100644 --- a/example_12/CMakeLists.txt +++ b/example_12/CMakeLists.txt @@ -44,10 +44,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_9_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_12.xml) @@ -66,10 +62,6 @@ $ target_link_libraries(passthrough_controller PUBLIC passthrough_controller_parameters) ament_target_dependencies(passthrough_controller 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(passthrough_controller PRIVATE "passthrough_controller_BUILDING_DLL") - pluginlib_export_plugin_description_file(controller_interface passthrough_controller.xml) diff --git a/example_14/CMakeLists.txt b/example_14/CMakeLists.txt index ec42f2919..eca9253e9 100644 --- a/example_14/CMakeLists.txt +++ b/example_14/CMakeLists.txt @@ -40,10 +40,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_14_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_14.xml) diff --git a/example_2/CMakeLists.txt b/example_2/CMakeLists.txt index 4137558e2..01150f422 100644 --- a/example_2/CMakeLists.txt +++ b/example_2/CMakeLists.txt @@ -38,10 +38,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_2_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_2.xml) diff --git a/example_3/CMakeLists.txt b/example_3/CMakeLists.txt index 30d313f92..cf5470c6e 100644 --- a/example_3/CMakeLists.txt +++ b/example_3/CMakeLists.txt @@ -38,10 +38,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_3_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_3.xml) diff --git a/example_4/CMakeLists.txt b/example_4/CMakeLists.txt index 394e846f5..a56654e0e 100644 --- a/example_4/CMakeLists.txt +++ b/example_4/CMakeLists.txt @@ -38,10 +38,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_4_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_4.xml) diff --git a/example_5/CMakeLists.txt b/example_5/CMakeLists.txt index dd8659fe9..c4ee34da2 100644 --- a/example_5/CMakeLists.txt +++ b/example_5/CMakeLists.txt @@ -39,10 +39,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_5_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_5.xml) diff --git a/example_6/CMakeLists.txt b/example_6/CMakeLists.txt index 81bfc7dd8..612a1c65c 100644 --- a/example_6/CMakeLists.txt +++ b/example_6/CMakeLists.txt @@ -38,10 +38,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_6_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_6.xml) diff --git a/example_7/CMakeLists.txt b/example_7/CMakeLists.txt index 74242879a..b3871b98a 100644 --- a/example_7/CMakeLists.txt +++ b/example_7/CMakeLists.txt @@ -66,10 +66,6 @@ ament_target_dependencies( ${CONTROLLER_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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_7_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_7.xml) # Export controller plugins diff --git a/example_8/CMakeLists.txt b/example_8/CMakeLists.txt index 049f26834..4f19d5492 100644 --- a/example_8/CMakeLists.txt +++ b/example_8/CMakeLists.txt @@ -39,10 +39,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_8_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_8.xml) diff --git a/example_9/CMakeLists.txt b/example_9/CMakeLists.txt index dd8294971..5f84de236 100644 --- a/example_9/CMakeLists.txt +++ b/example_9/CMakeLists.txt @@ -38,10 +38,6 @@ ament_target_dependencies( ${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(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_9_BUILDING_DLL") - # Export hardware plugins pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_9.xml)