Skip to content

Commit cb7c283

Browse files
committed
fix: SystemInfo を相対パスで include していたため、Makefile.inc に common ディレクトリを追加
1 parent b4c7484 commit cb7c283

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y \
1414
&& apt-get clean && rm -rf /var/lib/apt/lists/*
1515

1616
# ビルド時に日本語が含まれていたらエラーになるので,C.UTF-8を指定
17-
ENV LANG=C.UTF-8
17+
ENV LANG=C.UTF-8
1818

1919
# RasPike-ART を clone
2020
# libraspike-artは,RasPike-ART内で運営がリンクで紐づけていたため,直接cloneする必要がある

Makefile.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ APPL_DIRS += \
1515
$(mkfile_path)modules\
1616
$(mkfile_path)modules/API\
1717
$(mkfile_path)modules/calculators\
18+
$(mkfile_path)modules/common\
1819
$(mkfile_path)modules/CameraCapture
1920

2021
INCLUDES += \
2122
-I$(mkfile_path)modules\
2223
-I$(mkfile_path)modules/API\
2324
-I$(mkfile_path)modules/calculators\
25+
-I$(mkfile_path)modules/common\
2426
-I$(mkfile_path)modules/CameraCapture \
2527
-I/usr/include/opencv4
2628

modules/calculators/Mileage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
**/
66

77
#include "Mileage.h"
8-
#include "../common/SystemInfo.h"
98

109
double Mileage::calculateWheelMileage(int angle)
1110
{

modules/calculators/Mileage.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#define MILEAGE_H
99

1010
#include <cmath>
11+
#include "common/SystemInfo.h"
1112

1213
class Mileage {
1314
public:

tests/MileageTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* @author molpui0726
55
*/
66

7-
#include "Mileage.h"
87
#include <cmath>
98
#include <gtest/gtest.h>
9+
#include "Mileage.h"
1010

1111
namespace etrobocon2025_test {
1212
TEST(MileageTest, CalculateMileage)

0 commit comments

Comments
 (0)