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

move from fetchcontent to submodule

Browse Source
This commit is contained in:
sani7
2026-02-14 14:30:48 +01:00
parent fbcac58feb
commit 7dfbfbffee
11 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+6
View File
@@ -10,3 +10,9 @@
[submodule "external/qwt"] [submodule "external/qwt"]
path = external/qwt path = external/qwt
url = https://github.com/Sani7/qwt.git url = https://github.com/Sani7/qwt.git
[submodule "external/magic_enum"]
path = external/magic_enum
url = https://github.com/Neargye/magic_enum.git
[submodule "external/json"]
path = external/json
url = https://github.com/nlohmann/json.git
client/CMakeLists.txt
-16
View File
@@ -1,21 +1,5 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
project(Simulator-CVS_I10 VERSION 0.1 LANGUAGES CXX)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
include(FetchContent)
FetchContent_Declare(magic_enum URL https://github.com/Neargye/magic_enum/releases/download/v0.9.6/magic_enum-v0.9.6.tar.gz DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
FetchContent_MakeAvailable(magic_enum)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
FetchContent_MakeAvailable(json)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets Svg WebSockets) find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets Svg WebSockets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Svg WebSockets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Svg WebSockets)
client/simulator_base.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include "web_socket_wrapper.h" #include "web_socket_wrapper.h"
#include <QMainWindow> #include <QMainWindow>
#include <QWidget> #include <QWidget>
#include <magic_enum.hpp> #include <magic_enum/magic_enum.hpp>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
using json = nlohmann::json; using json = nlohmann::json;
client/web_socket_wrapper.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "web_socket_wrapper.h" #include "web_socket_wrapper.h"
#include "magic_enum.hpp"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include <magic_enum/magic_enum.hpp>
Web_socket_wrapper::Web_socket_wrapper(const QUrl &url, QObject *parent) Web_socket_wrapper::Web_socket_wrapper(const QUrl &url, QObject *parent)
: QObject(parent), m_web_socket(new QWebSocket("", QWebSocketProtocol::VersionLatest, this)), : QObject(parent), m_web_socket(new QWebSocket("", QWebSocketProtocol::VersionLatest, this)),
external/CMakeLists.txt
Vendored
+4 -1
View File
@@ -1,3 +1,6 @@
add_subdirectory(color) add_subdirectory(color)
add_subdirectory(spdlog)
add_subdirectory(cpp-templates) add_subdirectory(cpp-templates)
add_subdirectory(json)
add_subdirectory(magic_enum)
add_subdirectory(spdlog)
add_subdirectory(qwt)
external/json
Vendored Submodule
+1
Submodule external/json added at 9cca280a4d
external/magic_enum
Vendored Submodule
+1
Submodule external/magic_enum added at e046b69a37
server/CAN/CAN_interface.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "CAN_interface.hpp" #include "CAN_interface.hpp"
#include "magic_enum.hpp"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include <magic_enum/magic_enum.hpp>
CAN_Interface::CAN_Interface(QString dev, QObject *parent) : QObject(parent) CAN_Interface::CAN_Interface(QString dev, QObject *parent) : QObject(parent)
{ {
server/CMakeLists.txt
-5
View File
@@ -9,11 +9,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core WebSockets SerialBus)
qt_standard_project_setup() qt_standard_project_setup()
qt_add_executable(server) qt_add_executable(server)
include(FetchContent)
FetchContent_Declare(magic_enum URL https://github.com/Neargye/magic_enum/releases/download/v0.9.6/magic_enum-v0.9.6.tar.gz DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
FetchContent_MakeAvailable(magic_enum)
file(GLOB_RECURSE SIM_SOURCES "simulators/*.[hc]pp") file(GLOB_RECURSE SIM_SOURCES "simulators/*.[hc]pp")
file(GLOB_RECURSE CAN_SOURCES "CAN/*.[hc]pp") file(GLOB_RECURSE CAN_SOURCES "CAN/*.[hc]pp")
server/message_parser.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "simulators.hpp" #include "simulators.hpp"
#include <magic_enum.hpp> #include <magic_enum/magic_enum.hpp>
QString Simulators::message_parser(QString message) QString Simulators::message_parser(QString message)
{ {
src/UI/CMakeLists.txt
-5
View File
@@ -1,10 +1,5 @@
add_library(UI) add_library(UI)
include(FetchContent)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
FetchContent_MakeAvailable(json)
find_package(Qt6 REQUIRED COMPONENTS Core SerialBus) find_package(Qt6 REQUIRED COMPONENTS Core SerialBus)
set_target_properties( set_target_properties(