From e3012d95809f37de407fd4f84eea7bb071be6d14 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Mon, 6 Oct 2025 20:39:40 +0200 Subject: [PATCH] UI remove ui_can out of custom folder --- UI/CMakeLists.txt | 2 -- UI/ui.hpp | 2 +- UI/{custom => }/ui_can.cpp | 0 UI/{custom => }/ui_can.hpp | 0 4 files changed, 1 insertion(+), 3 deletions(-) rename UI/{custom => }/ui_can.cpp (100%) rename UI/{custom => }/ui_can.hpp (100%) diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt index 39dd762..a8f839f 100644 --- a/UI/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -13,7 +13,6 @@ target_compile_options(UI PRIVATE $<$: -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion >) -file(GLOB_RECURSE CUSTOM_UI_SOURCES "custom/*.?pp") file(GLOB_RECURSE UI_SOURCES "*.?pp") target_sources(UI @@ -25,7 +24,6 @@ target_sources(UI target_include_directories(UI PUBLIC ${CMAKE_CURRENT_LIST_DIR} - ${CMAKE_CURRENT_LIST_DIR}/custom/** PRIVATE ${PROJECT_DIR}/external/** ${PROJECT_DIR}/src/CAN/ diff --git a/UI/ui.hpp b/UI/ui.hpp index 81fd9b1..727f632 100644 --- a/UI/ui.hpp +++ b/UI/ui.hpp @@ -17,4 +17,4 @@ #include "ui_textbox.hpp" #include "ui_thermo.hpp" -#include "custom/ui_can.hpp" +#include "ui_can.hpp" diff --git a/UI/custom/ui_can.cpp b/UI/ui_can.cpp similarity index 100% rename from UI/custom/ui_can.cpp rename to UI/ui_can.cpp diff --git a/UI/custom/ui_can.hpp b/UI/ui_can.hpp similarity index 100% rename from UI/custom/ui_can.hpp rename to UI/ui_can.hpp