software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

chore: update files of project

Browse Source
This commit is contained in:
wuhai 2024-03-19 16:21:12 +08:00
parent e108f60f69
commit 94ad23f5e0
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -13,18 +13,13 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(X_TOOLS_QT_COMPONENTS
Core
Gui
Widgets
WebSockets
Network)
set(X_TOOLS_QT_COMPONENTS Core Gui Widgets WebSockets Network)
if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
list(APPEND X_TOOLS_QT_COMPONENTS SerialPort)
list(APPEND X_TOOLS_QT_COMPONENTS SerialBus)
add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALPORT)
add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALBUS)
list(APPEND X_TOOLS_QT_COMPONENTS SerialPort)
list(APPEND X_TOOLS_QT_COMPONENTS SerialBus)
add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALPORT)
add_compile_definitions(X_TOOLS_IMPORT_MODULE_SERIALBUS)
endif()
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS ${X_TOOLS_QT_COMPONENTS})
@ -73,6 +68,7 @@ list(APPEND X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Assistants/xToolsAssistant
list(APPEND X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Assistants/xToolsAssistantFactory.cpp)
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_CMAKE_FILES})
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants)
include_directories(${CMAKE_SOURCE_DIR}/Source/Common/Common)
include_directories(${CMAKE_SOURCE_DIR}/Source/Common/CommonUI)
include_directories(${CMAKE_SOURCE_DIR}/Source/Tools/Tools)
@ -80,6 +76,9 @@ include_directories(${CMAKE_SOURCE_DIR}/Source/Tools/ToolsUI)
include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBox)
include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBoxUI)
set(WITH_GFLAGS OFF)
set(BUILD_SHARED_LIBS OFF)
sak_add_subdirectory("glog-0.7.0")
sak_add_subdirectory("Qt-AES-master")
sak_add_subdirectory("nodeeditor-3.0.10")
@ -92,8 +91,8 @@ target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Network)
target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::WebSockets)
if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialPort)
target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialBus)
target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialPort)
target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::SerialBus)
endif()
target_link_libraries(xTools PRIVATE qmdnsengine)
target_link_libraries(xTools PRIVATE glog::glog)

2
Source/mainwindow.cc
View File

@ -35,13 +35,13 @@
#include <QToolButton>
#include <QVariant>
#include "sakassistantsfactory.h"
#include "sakdatastructure.h"
#include "sakinterface.h"
#include "saksettings.h"
#include "saktoolboxui.h"
#include "saktranslator.h"
#include "sakuiinterface.h"
#include "xToolsAssistantFactory.h"
#ifdef SAK_IMPORT_MODULE_CANBUSSTUDIO
#include "sakcanbusstudioui.h"