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.

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

add ign packages to linux #146

Merged
merged 26 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
dc428ec
add ign packages to win and osx
raghavauppuluri13 Jun 11, 2021
daf991f
removed ign packages
raghavauppuluri13 Jun 11, 2021
99c1e85
fixed ign package naming typos
raghavauppuluri13 Jun 11, 2021
10ae866
Update dependencies.yaml
Tobias-Fischer Jun 12, 2021
5f0d763
Merge branch 'master' into add-ign
Tobias-Fischer Jun 13, 2021
09ab873
Update dependencies.yaml
Tobias-Fischer Jun 13, 2021
ee0ff42
Create ros-noetic-ros-ign-bridge.patch
Tobias-Fischer Jun 13, 2021
4fd19ef
ign is not yet available on osx
Tobias-Fischer Jul 20, 2021
2adb736
Merge branch 'master' into add-ign
Tobias-Fischer Jul 20, 2021
71dc5bc
Fix
Tobias-Fischer Jul 20, 2021
dc45213
Update mapping for ignition-gazebo
Tobias-Fischer Jul 20, 2021
131f168
Merge branch 'master' into add-ign
Tobias-Fischer Jul 22, 2021
aadda33
Delete ros-noetic-ros-ign-bridge.patch
Tobias-Fischer Jul 22, 2021
333a710
Bump citadel -> edifice
Tobias-Fischer Jul 23, 2021
76f5b18
Update ros-noetic-ros-ign-gazebo.patch
Tobias-Fischer Jul 23, 2021
8b0729b
Create ros-noetic-ros-ign-bridge.patch
Tobias-Fischer Jul 23, 2021
e3d39b3
Create ros-noetic-ros-ign-image.patch
Tobias-Fischer Jul 23, 2021
49b2f2d
Update ros-noetic-ros-ign-image.patch
Tobias-Fischer Jul 23, 2021
a1ca728
Merge branch 'main' into add-ign
Tobias-Fischer Feb 29, 2024
d70d4f2
Update to Fortress
Tobias-Fischer Feb 29, 2024
c2e9cf2
Add ros-ign to linux-64
Tobias-Fischer Feb 29, 2024
147a4ac
Update ros-noetic-ros-ign-bridge.patch
Tobias-Fischer Feb 29, 2024
2a88cf7
Update ros-noetic-ros-ign-gazebo.patch
Tobias-Fischer Feb 29, 2024
2b4a3e6
Update ros-noetic-ros-ign-image.patch
Tobias-Fischer Feb 29, 2024
872ec36
Update ros-noetic-plotjuggler.patch
Tobias-Fischer Feb 29, 2024
ae00eea
Not on Win
Tobias-Fischer Mar 1, 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
29 changes: 11 additions & 18 deletions patch/ros-noetic-plotjuggler.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)
13 changes: 13 additions & 0 deletions patch/ros-noetic-ros-ign-bridge.patch
Original file line number Diff line number Diff line change
@@ -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})

22 changes: 11 additions & 11 deletions patch/ros-noetic-ros-ign-gazebo.patch
Original file line number Diff line number Diff line change
@@ -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})

27 changes: 27 additions & 0 deletions patch/ros-noetic-ros-ign-image.patch
Original file line number Diff line number Diff line change
@@ -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()
16 changes: 8 additions & 8 deletions robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions vinca_linux_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions vinca_win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading