add ign packages to linux (#146)

* add ign packages to win and osx * removed ign packages * fixed ign package naming typos * Update dependencies.yaml * Update dependencies.yaml * Create ros-noetic-ros-ign-bridge.patch * ign is not yet available on osx * Fix * Update mapping for ignition-gazebo * Delete ros-noetic-ros-ign-bridge.patch * Bump citadel -> edifice * Update ros-noetic-ros-ign-gazebo.patch * Create ros-noetic-ros-ign-bridge.patch * Create ros-noetic-ros-ign-image.patch * Update ros-noetic-ros-ign-image.patch * Update to Fortress * Add ros-ign to linux-64 * Update ros-noetic-ros-ign-bridge.patch * Update ros-noetic-ros-ign-gazebo.patch * Update ros-noetic-ros-ign-image.patch * Update ros-noetic-plotjuggler.patch * Not on Win --------- Co-authored-by: Tobias Fischer <[email protected]>
RoboStack · Mar 1, 2024 · c06cdce · c06cdce
1 parent 9f0fcd0
commit c06cdce
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 37 deletions.
diff --git a/patch/ros-noetic-plotjuggler.patch b/patch/ros-noetic-plotjuggler.patch
@@ -214,24 +214,17 @@ index 00000000..a2e2757a
 +
 +list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS)
 diff --git a/plotjuggler_plugins/ParserProtobuf/CMakeLists.txt b/plotjuggler_plugins/ParserProtobuf/CMakeLists.txt
-index 084c93cb..d484adf6 100644
+index f399fdad9..94d1330da 100644
 --- a/plotjuggler_plugins/ParserProtobuf/CMakeLists.txt
 +++ b/plotjuggler_plugins/ParserProtobuf/CMakeLists.txt
-@@ -4,7 +4,7 @@ include_directories( ../ )
- add_definitions(${QT_DEFINITIONS})
- add_definitions(-DQT_PLUGIN)
-
--find_package(Protobuf QUIET)
-+find_package(Protobuf QUIET CONFIG)
-
- if( Protobuf_FOUND)
-     message(STATUS "[Protobuf] found")
-@@ -24,7 +24,7 @@ if( Protobuf_FOUND)
-     target_link_libraries(ProtobufParser
-         ${Qt5Widgets_LIBRARIES}
-         ${Qt5Xml_LIBRARIES}
--        ${Protobuf_LIBRARIES}
-+        protobuf::libprotobuf
-         plotjuggler_base
-         plotjuggler_qwt)
+@@ -3,8 +3,8 @@ if(BUILDING_WITH_CONAN)
+     set(Protobuf_LIBS protobuf::libprotobuf)
+ else()
+     message(STATUS "Finding Protobuf without package managers")
+-    find_package(Protobuf QUIET)
+-    set(Protobuf_LIBS ${Protobuf_LIBRARIES})
++    find_package(Protobuf QUIET CONFIG)
++    set(Protobuf_LIBS protobuf::libprotobuf)
+ endif()
 
+ find_package(Protobuf QUIET)
diff --git a/patch/ros-noetic-ros-ign-bridge.patch b/patch/ros-noetic-ros-ign-bridge.patch
@@ -0,0 +1,13 @@
+diff --git a/ros_ign_bridge/CMakeLists.txt b/ros_ign_bridge/CMakeLists.txt
+index 5e04c45d..a60f0be0 100644
+--- a/ros_ign_bridge/CMakeLists.txt
++++ b/ros_ign_bridge/CMakeLists.txt
+@@ -21,7 +21,7 @@ find_package(catkin REQUIRED COMPONENTS
+                visualization_msgs)
+
+ # Fortress
+-if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
++if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress" OR TRUE)
+   find_package(ignition-transport11 REQUIRED)
+   set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
+
diff --git a/patch/ros-noetic-ros-ign-gazebo.patch b/patch/ros-noetic-ros-ign-gazebo.patch
@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1497055..88ec5ca 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,7 @@ if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
+diff --git a/ros_ign_gazebo/CMakeLists.txt b/ros_ign_gazebo/CMakeLists.txt
+index 87a06f8e..01ad5664 100644
+--- a/ros_ign_gazebo/CMakeLists.txt
++++ b/ros_ign_gazebo/CMakeLists.txt
+@@ -9,7 +9,7 @@ find_package(catkin
+ )
 
-   message(STATUS "Compiling against Ignition Fortress")
- # Edifice
--elseif ("$ENV{IGNITION_VERSION}" STREQUAL "edifice")
-+elseif ("$ENV{IGNITION_VERSION}" STREQUAL "edifice" OR TRUE)
-   find_package(ignition-transport10 REQUIRED)
-   set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+ # Fortress
+-if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
++if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress" OR TRUE)
+   find_package(ignition-transport11 REQUIRED)
+   set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
diff --git a/patch/ros-noetic-ros-ign-image.patch b/patch/ros-noetic-ros-ign-image.patch
@@ -0,0 +1,27 @@
+diff --git a/ros_ign_image/CMakeLists.txt b/ros_ign_image/CMakeLists.txt
+index 5bbf70f4..87fb109d 100644
+--- a/ros_ign_image/CMakeLists.txt
++++ b/ros_ign_image/CMakeLists.txt
+@@ -17,7 +17,7 @@ find_package(catkin REQUIRED COMPONENTS
+   sensor_msgs)
+
+ # Fortress
+-if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
++if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress" OR TRUE)
+   find_package(ignition-transport11 REQUIRED)
+   set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
+
+@@ -68,6 +68,7 @@ install(TARGETS ${executable}
+ )
+
+ # Tests
++if(FALSE)
+ find_package(rostest REQUIRED)
+
+ set(test_publishers
+@@ -101,4 +102,4 @@ foreach(test_subscriber ${test_subscribers})
+     ignition-transport${IGN_TRANSPORT_VER}::core
+   )
+ endforeach(test_subscriber)
+-
++endif()
diff --git a/robostack.yaml b/robostack.yaml
@@ -145,27 +145,27 @@ ignition-common4:
 ignition-cmake2:
   robostack: [libignition-cmake2]
 ignition-gazebo3:
-  robostack: [libignition-gazebo5]
+  robostack: [libignition-gazebo6]
 ignition-gazebo5:
-  robostack: [libignition-gazebo5]
+  robostack: [libignition-gazebo6]
 ignition-gazebo6:
   robostack: [libignition-gazebo6]
 ignition-gui5:
-  robostack: [libignition-gui5]
+  robostack: [libignition-gui6]
 ignition-math6:
   robostack: [libignition-math6]
 ignition-msgs5:
-  robostack: [libignition-msgs5]
+  robostack: [libignition-msgs8]
 ignition-msgs8:
   robostack: [libignition-msgs8]
 ignition-msgs7:
-  robostack: [libignition-msgs7]
+  robostack: [libignition-msgs8]
 ignition-rendering5:
-  robostack: [libignition-rendering5]
+  robostack: [libignition-rendering6]
 ignition-transport8:
-  robostack: [libignition-transport8]
+  robostack: [libignition-transport11]
 ignition-transport10:
-  robostack: [libignition-transport10]
+  robostack: [libignition-transport11]
 ignition-transport11:
   robostack: [libignition-transport11]
 java:

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -227,6 +227,12 @@ packages_select_by_deps:
   - rosfmt
   - rosmon
 
+  - ros-ign
+  - ros-ign-bridge 
+  - ros-ign-gazebo 
+  - ros-ign-gazebo-demos 
+  - ros-ign-image
+
   # Needs fixing in CI, uploaded manually
   - rtabmap
   - rtabmap-ros

diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -124,6 +124,16 @@ packages_select_by_deps:
   ##
   ## PREVIOUSLY SUPPORTED PACKAGES, NOW NOT PACKAGED ANYMORE UNTIL REQUESTED
   ##
+
+  # The Ignition Fortress packages do not work properly on Windows
+  # Feel free to reach out to the RoboStack maintainers if you would like to
+  # work on this.
+  # - ros-ign
+  # - ros-ign-bridge 
+  # - ros-ign-gazebo 
+  # - ros-ign-gazebo-demos 
+  # - ros-ign-image
+
   # Fails due to Too long input line.
   # - hector-gazebo-plugins
   # - dynamixel-sdk -- this one not ready for Windows