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.

Sign up for GitHub

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

Jump to bottom

Renames origin_display to origin_display0 #374

Merged
merged 1 commit into from
Apr 5, 2021
Merged

Renames origin_display to origin_display0 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions delphyne_gui/visualizer/display_plugins/CMakeLists.txt
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ualizer/display_plugins/origin_display.cc → ...alizer/display_plugins/origin_display0.cc
View file
Open in desktop
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
0 ...ualizer/display_plugins/origin_display.hh → ...alizer/display_plugins/origin_display0.hh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion delphyne_gui/visualizer/layout_with_teleop.config
View file
Open in desktop
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>