Skip to content

Commit aebe9f4

Browse files
mosfet80ahcorde
andcommitted
Update rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in
Co-authored-by: Alejandro Hernández Cordero <[email protected]> Signed-off-by: mosfet80 <[email protected]>
1 parent 1612ac6 commit aebe9f4

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

rviz_ogre_vendor/package.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model
33
href="http://download.ros.org/schema/package_format2.xsd"
44
schematypens="http://www.w3.org/2001/XMLSchema"?>
5-
<package format="2">
5+
<package format="3">
66
<name>rviz_ogre_vendor</name>
77
<version>15.1.9</version>
88
<description>
@@ -28,7 +28,8 @@
2828
<build_export_depend>libglew-dev</build_export_depend>
2929
<exec_depend>libfreetype6</exec_depend>
3030

31-
<depend>libx11-dev</depend>
31+
<depend condition="$XDG_SESSION_TYPE == 'x11'">libx11-dev</depend>
32+
<depend condition="$XDG_SESSION_TYPE == 'wayland'">libwayland-dev</depend>
3233
<depend>libxaw</depend>
3334
<depend>libxrandr</depend>
3435
<depend>opengl</depend>

rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ foreach(_lib IN LISTS OGRE_LIBRARIES)
138138
pkg_check_modules(waylands IMPORTED_TARGET wayland-client wayland-egl egl)
139139
endif()
140140

141-
142-
143141
endif()
144142
if(APPLE)
145143
list(APPEND _extra_interface_link_libraries "-framework Cocoa")

0 commit comments

Comments
 (0)