Skip to content

Commit

Permalink
Update gz-ros2-control patch
Browse files Browse the repository at this point in the history
  • Loading branch information
traversaro committed Jan 24, 2025
1 parent e8bb9e8 commit fbf3cc6
Showing 1 changed file with 25 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,30 @@ index 196f62d5..a7bdfd01 100644
+ add_library(TINYXML2::TINYXML2 INTERFACE IMPORTED)
+ set_property(TARGET tinyxml2::tinyxml2 PROPERTY INTERFACE_LINK_LIBRARIES tinyxml2::tinyxml2)
+endif()
+
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
find_package(gz_sim_vendor REQUIRED)
find_package(gz-sim REQUIRED)

diff --git a/gz_ros2_control/src/gz_ros2_control_plugin.cpp b/gz_ros2_control/src/gz_ros2_control_plugin.cpp
index d38ce556..333d42a5 100644
--- a/gz_ros2_control/src/gz_ros2_control_plugin.cpp
+++ b/gz_ros2_control/src/gz_ros2_control_plugin.cpp
@@ -15,5 +15,3 @@
-#include <unistd.h>
-
#include <chrono>
#include <map>
#include <memory>

diff --git a/gz_ros2_control/src/gz_system.cpp b/gz_ros2_control/src/gz_system.cpp
index 5c9952b9..d5554d2c 100644
--- a/gz_ros2_control/src/gz_system.cpp
+++ b/gz_ros2_control/src/gz_system.cpp
@@ -51,3 +51,7 @@
+#ifdef ERROR
+#undef ERROR
+#endif
+
struct jointData
{
/// \brief Joint's names.

0 comments on commit fbf3cc6

Please sign in to comment.