sani7/remote-ui
1
0
Fork 0
mirror of https://github.com/Sani7/remote-ui.git synced 2026-10-26 21:51:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix can

Browse Source
This commit is contained in:
sani7
2026-02-14 14:32:45 +01:00
parent 1b8bc4b692
commit 41058957f2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/CMakeLists.txt
+1 -2
View File
@@ -37,7 +37,6 @@ target_include_directories(unisim_server
PUBLIC PUBLIC
${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_LIST_DIR}/simulators ${CMAKE_CURRENT_LIST_DIR}/simulators
${CMAKE_CURRENT_LIST_DIR}/extensions/CAN
${CMAKE_CURRENT_LIST_DIR}/extensions ${CMAKE_CURRENT_LIST_DIR}/extensions
PRIVATE PRIVATE
) )
@@ -70,7 +69,7 @@ foreach(sim ${sims})
# Create a library for each .cpp file # Create a library for each .cpp file
add_library(sim_${LIB_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.hpp ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.cpp) add_library(sim_${LIB_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.hpp ${CMAKE_CURRENT_SOURCE_DIR}/simulators/${LIB_NAME}.cpp)
target_link_libraries(sim_${LIB_NAME} PRIVATE Qt::SerialBus magic_enum::magic_enum nlohmann_json::nlohmann_json) target_link_libraries(sim_${LIB_NAME} PRIVATE Qt::SerialBus magic_enum::magic_enum nlohmann_json::nlohmann_json)
target_include_directories(sim_${LIB_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/extensions ${CMAKE_CURRENT_LIST_DIR}/extensions/CAN_R1 ${CMAKE_SOURCE_DIR}/UI ${CMAKE_SOURCE_DIR}/external/color ${CMAKE_SOURCE_DIR}/external/spdlog/include) target_include_directories(sim_${LIB_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/extensions ${CMAKE_SOURCE_DIR}/UI ${CMAKE_SOURCE_DIR}/external/color ${CMAKE_SOURCE_DIR}/external/spdlog/include)
add_custom_command(TARGET sim_${LIB_NAME} POST_BUILD add_custom_command(TARGET sim_${LIB_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_FILE:sim_${LIB_NAME}> $<TARGET_FILE:sim_${LIB_NAME}>
server/simulator_base.hpp
+1 -1
View File
@@ -4,6 +4,7 @@
#include <QThread> #include <QThread>
#include <QTimer> #include <QTimer>
#include "extensions/CAN_interface.hpp"
#ifndef INTERNAL #ifndef INTERNAL
#include "ui.hpp" #include "ui.hpp"
#else #else
@@ -11,7 +12,6 @@
using json = nlohmann::json; using json = nlohmann::json;
#include "extensions/CAN_interface.hpp"
Q_FORWARD_DECLARE_OBJC_CLASS(UI_item); Q_FORWARD_DECLARE_OBJC_CLASS(UI_item);
#endif #endif
server/simulators/can_debugger.cpp
+1
View File
@@ -1,4 +1,5 @@
#include "can_debugger.hpp" #include "can_debugger.hpp"
#include "extensions/CAN_interface.hpp"
EXPORT_SIM(Can_Debugger); EXPORT_SIM(Can_Debugger);