Skip to content

Commit 6ed64c1

Browse files
author
KhalilSelyan
committed
header files moved to src/include folder
Signed-off-by: KhalilSelyan <khalil@leodrive.ai>
1 parent 0cf40d9 commit 6ed64c1

21 files changed

+20
-35
lines changed

common/tier4_state_rviz_plugin/CMakeLists.txt

+10-25
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,20 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
2121
src/custom_segmented_button.cpp
2222
src/custom_segmented_button_item.cpp
2323
src/custom_label.cpp
24-
include/autoware_state_panel.hpp
25-
include/custom_button.hpp
26-
include/custom_container.hpp
27-
include/custom_icon_label.hpp
28-
include/custom_label.hpp
29-
include/custom_segmented_button_item.hpp
30-
include/custom_segmented_button.hpp
31-
include/custom_slider.hpp
32-
include/custom_toggle_switch.hpp
33-
include/velocity_steering_factors_panel.hpp
24+
src/include/autoware_state_panel.hpp
25+
src/include/custom_button.hpp
26+
src/include/custom_container.hpp
27+
src/include/custom_icon_label.hpp
28+
src/include/custom_label.hpp
29+
src/include/custom_segmented_button_item.hpp
30+
src/include/custom_segmented_button.hpp
31+
src/include/custom_slider.hpp
32+
src/include/custom_toggle_switch.hpp
33+
src/include/velocity_steering_factors_panel.hpp
3434
)
3535

3636
target_include_directories(
3737
${PROJECT_NAME} PUBLIC
38-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
39-
$<INSTALL_INTERFACE:include>
4038
)
4139

4240

@@ -48,19 +46,6 @@ target_link_libraries(${PROJECT_NAME}
4846
pluginlib_export_plugin_description_file(rviz_common plugins/plugin_description.xml)
4947

5048

51-
install(
52-
TARGETS ${PROJECT_NAME}
53-
EXPORT ${PROJECT_NAME}
54-
ARCHIVE DESTINATION lib
55-
LIBRARY DESTINATION lib
56-
RUNTIME DESTINATION bin
57-
INCLUDES DESTINATION include
58-
)
59-
60-
install(
61-
DIRECTORY include/
62-
DESTINATION include
63-
)
6449

6550

6651
ament_auto_package(

common/tier4_state_rviz_plugin/src/autoware_state_panel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// limitations under the License.
1515
//
1616

17-
#include "autoware_state_panel.hpp"
17+
#include "include/autoware_state_panel.hpp"
1818

1919
#include <rviz_common/display_context.hpp>
2020

common/tier4_state_rviz_plugin/src/custom_button.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "custom_button.hpp"
1+
#include "include/custom_button.hpp"
22

33
CustomElevatedButton::CustomElevatedButton(
44
const QString & text, const QColor & bgColor, const QColor & textColor, QWidget * parent)

common/tier4_state_rviz_plugin/src/custom_container.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "custom_container.hpp"
1+
#include "include/custom_container.hpp"
22

33
CustomContainer::CustomContainer(QWidget * parent) : QFrame(parent), cornerRadius(15)
44
{

common/tier4_state_rviz_plugin/src/custom_icon_label.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "custom_icon_label.hpp"
1+
#include "include/custom_icon_label.hpp"
22

33
#include <ament_index_cpp/get_package_share_directory.hpp>
44

common/tier4_state_rviz_plugin/src/custom_label.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "custom_label.hpp"
1+
#include "include/custom_label.hpp"
22

33
#include <QColor>
44
#include <QGraphicsDropShadowEffect>

common/tier4_state_rviz_plugin/src/custom_segmented_button.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "custom_segmented_button.hpp"
1+
#include "include/custom_segmented_button.hpp"
22

33
#include <qsizepolicy.h>
44

common/tier4_state_rviz_plugin/src/custom_segmented_button_item.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "custom_segmented_button_item.hpp"
1+
#include "include/custom_segmented_button_item.hpp"
22

33
#include <qnamespace.h>
44

common/tier4_state_rviz_plugin/src/custom_slider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "custom_slider.hpp"
1+
#include "include/custom_slider.hpp"
22

33
CustomSlider::CustomSlider(Qt::Orientation orientation, QWidget * parent)
44
: QSlider(orientation, parent)

common/tier4_state_rviz_plugin/src/custom_toggle_switch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// CustomToggleSwitch.cpp
2-
#include "custom_toggle_switch.hpp"
2+
#include "include/custom_toggle_switch.hpp"
33

44
CustomToggleSwitch::CustomToggleSwitch(QWidget * parent) : QCheckBox(parent), isDragging(false)
55
{

common/tier4_state_rviz_plugin/src/velocity_steering_factors_panel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// limitations under the License.
1515
//
1616

17-
#include "velocity_steering_factors_panel.hpp"
17+
#include "include/velocity_steering_factors_panel.hpp"
1818

1919
#include <QGridLayout>
2020
#include <QHBoxLayout>

0 commit comments

Comments
 (0)