Skip to content

Commit

Permalink
Renames origin_display to origin_display0 (#374)
Browse files Browse the repository at this point in the history
  • Loading branch information
agalbachicar authored Apr 5, 2021
1 parent 6441e8e commit da749ae
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions delphyne_gui/visualizer/display_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ include_directories(
)

# Origin display plugin.
QT5_WRAP_CPP(OriginDisplay_MOC origin_display.hh)
QT5_WRAP_CPP(OriginDisplay0_MOC origin_display0.hh)

add_library(origin_display
${CMAKE_CURRENT_SOURCE_DIR}/origin_display.cc
${OriginDisplay_MOC}
add_library(origin_display0
${CMAKE_CURRENT_SOURCE_DIR}/origin_display0.cc
${OriginDisplay0_MOC}
)
add_library(delphyne_gui::origin_display ALIAS origin_display)
set_target_properties(origin_display
add_library(delphyne_gui::origin_display0 ALIAS origin_display0)
set_target_properties(origin_display0
PROPERTIES
OUTPUT_NAME delphyne_gui_origin_display
OUTPUT_NAME delphyne_gui_origin_display0
)

target_link_libraries(origin_display
target_link_libraries(origin_display0
ignition-common3::ignition-common3
ignition-gui0::ignition-gui0
ignition-msgs5::ignition-msgs5
Expand All @@ -28,7 +28,7 @@ target_link_libraries(origin_display
)

install(
TARGETS origin_display
TARGETS origin_display0
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <ignition/common/PluginMacros.hh>
#include <ignition/rendering/Text.hh>

#include "origin_display.hh"
#include "origin_display0.hh"

using namespace delphyne;
using namespace gui;
Expand Down
2 changes: 1 addition & 1 deletion delphyne_gui/visualizer/layout_with_teleop.config
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<pose>0 0 0 0 -0 0</pose>
<color>0.7 0.7 0.7 0.3</color>
</display>
<display type="delphyne_gui_origin_display" />
<display type="delphyne_gui_origin_display0" />
<display type="delphyne_gui_agent_info_display0" />
</displays>
</plugin>

0 comments on commit da749ae

Please sign in to comment.