mirror of
https://github.com/x-tools-author/x-tools.git
synced 2025-09-15 15:28:40 +08:00
chore: update files of project
This commit is contained in:
x-tools-author
parent
b33cfa1b39
commit
78f297aa17
@ -42,24 +42,6 @@ x_tools_git_get_latest_commit_time(${CMAKE_SOURCE_DIR} "X_TOOLS")
|
||||
# Common module
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/Common/Common)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/Common/CommonUI)
|
||||
if(QT_VERSION_MAJOR EQUAL 6)
|
||||
option(X_TOOLS_IMPORT_MODULE_BLUETOOTH "Enable Bluetooth modbule" ON)
|
||||
else()
|
||||
option(X_TOOLS_IMPORT_MODULE_BLUETOOTH "Enable Bluetooth modbule" OFF)
|
||||
endif()
|
||||
set(X_TOOLS_BLUETOOTH_MODULE_IS_VALID FALSE)
|
||||
if(X_TOOLS_IMPORT_MODULE_BLUETOOTH AND QT_VERSION_MAJOR GREATER 5)
|
||||
if(NOT Qt${QT_VERSION_MAJOR}_VERSION VERSION_LESS "6.5.0")
|
||||
find_package(
|
||||
Qt${QT_VERSION_MAJOR} REQUIRED
|
||||
COMPONENTS Bluetooth
|
||||
QUIET)
|
||||
if(Qt${QT_VERSION_MAJOR}Bluetooth_FOUND)
|
||||
add_compile_definitions(X_TOOLS_IMPORT_MODULE_BLUETOOTH)
|
||||
set(X_TOOLS_BLUETOOTH_MODULE_IS_VALID TRUE)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
add_subdirectory(Source/Common)
|
||||
|
||||
file(GLOB_RECURSE X_TOOLS_TOOLS_SOURCE_H "${CMAKE_SOURCE_DIR}/Source/Tools/*.h")
|
||||
@ -96,7 +78,6 @@ 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})
|
||||
list(APPEND X_TOOLS_SOURCE xTools.qrc)
|
||||
# list(APPEND X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Common/xToolsCommon.qrc)
|
||||
if(WIN32)
|
||||
list(APPEND X_TOOLS_SOURCE xTools.rc)
|
||||
endif()
|
||||
@ -117,50 +98,6 @@ include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/String/Source)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Broadcast/Source)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/FileCheck/Source)
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# Modbus module
|
||||
option(X_TOOLS_IMPORT_MODULE_MODBUS_STUDIO "Enable Modbus Studio module" ON)
|
||||
if(X_TOOLS_IMPORT_MODULE_MODBUS_STUDIO)
|
||||
file(GLOB_RECURSE X_TOOLS_MODBUS_STUDIO_H "${CMAKE_SOURCE_DIR}/Source/ModbusStudio/*.h")
|
||||
file(GLOB_RECURSE X_TOOLS_MODBUS_STUDIO_UI "${CMAKE_SOURCE_DIR}/Source/ModbusStudio/*.ui")
|
||||
file(GLOB_RECURSE X_TOOLS_MODBUS_STUDIO_CPP "${CMAKE_SOURCE_DIR}/Source/ModbusStudio/*.cpp")
|
||||
add_compile_definitions(X_TOOLS_IMPORT_MODULE_MODBUS_STUDIO)
|
||||
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_MODBUS_STUDIO_H})
|
||||
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_MODBUS_STUDIO_UI})
|
||||
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_MODBUS_STUDIO_CPP})
|
||||
list(REMOVE_ITEM X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/ModbusStudio/main.cpp)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/ModbusStudio/ModbusStudio)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/ModbusStudio/ModbusStudioUI)
|
||||
endif()
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# CAN bus module
|
||||
|
||||
option(X_TOOLS_IMPORT_MODULE_CANBUS_STUDIO "Enable CAN Bus module" ON)
|
||||
if(X_TOOLS_IMPORT_MODULE_CANBUS_STUDIO)
|
||||
file(GLOB_RECURSE X_TOOLS_CANBUS_STUDIO_H "${CMAKE_SOURCE_DIR}/Source/CANBusStudio/*.h")
|
||||
file(GLOB_RECURSE X_TOOLS_CANBUS_STUDIO_UI "${CMAKE_SOURCE_DIR}/Source/CANBusStudio/*.ui")
|
||||
file(GLOB_RECURSE X_TOOLS_CANBUS_STUDIO_CPP "${CMAKE_SOURCE_DIR}/Source/CANBusStudio/*.cpp")
|
||||
add_compile_definitions(X_TOOLS_IMPORT_MODULE_CANBUS_STUDIO)
|
||||
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_CANBUS_STUDIO_H})
|
||||
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_CANBUS_STUDIO_UI})
|
||||
list(APPEND X_TOOLS_SOURCE ${X_TOOLS_CANBUS_STUDIO_CPP})
|
||||
list(REMOVE_ITEM X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/CANBusStudio/main.cpp)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/CANBusStudio/CANBusStudio)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Source/CANBusStudio/CANBusStudioUI)
|
||||
endif()
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# BLE module
|
||||
if(NOT X_TOOLS_BLUETOOTH_MODULE_IS_VALID)
|
||||
list(REMOVE_ITEM X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Tools/Tools/xToolsBleCentralTool.h)
|
||||
list(REMOVE_ITEM X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Tools/Tools/xToolsBleCentralTool.cpp)
|
||||
list(REMOVE_ITEM X_TOOLS_SOURCE ${CMAKE_SOURCE_DIR}/Source/Tools/ToolsUI/xToolsBleCentralToolUi.h)
|
||||
list(REMOVE_ITEM X_TOOLS_SOURCE
|
||||
${CMAKE_SOURCE_DIR}/Source/Tools/ToolsUI/xToolsBleCentralToolUi.cpp)
|
||||
message(STATUS "The xTools BLE module source has been removed!")
|
||||
endif()
|
||||
|
||||
# --------------------------------------------------------------------------------------------------
|
||||
# xTools application
|
||||
set(WITH_GFLAGS OFF)
|
||||
@ -169,8 +106,12 @@ set(BUILD_SHARED_LIBS OFF)
|
||||
|
||||
x_tools_add_third_party("glog-0.7.0")
|
||||
x_tools_add_third_party("qmdnsengine-master")
|
||||
add_subdirectory(${CMAKE_SOURCE_DIR}/Source/Private)
|
||||
|
||||
if(EXISTS ${CMAKE_SOURCE_DIR}/Source/Private/Private/Source/xTools/xToolsPrivate.cmake)
|
||||
include(${CMAKE_SOURCE_DIR}/Source/Private/Private/Source/xTools/xToolsPrivate.cmake)
|
||||
list(APPEND X_TOOLS_SOURCE
|
||||
${CMAKE_SOURCE_DIR}/Source/Private/Private/Source/xTools/xToolsPrivate.cmake)
|
||||
endif()
|
||||
# add_subdirectory(${CMAKE_SOURCE_DIR}/Source/Private)
|
||||
x_tools_add_executable(xTools ${X_TOOLS_SOURCE})
|
||||
x_tools_generate_translations(xTools)
|
||||
x_tools_deploy_qt(xTools)
|
||||
@ -196,18 +137,8 @@ if(X_TOOLS_BLUETOOTH_MODULE_IS_VALID)
|
||||
endif()
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# Other applications
|
||||
# Assistant applications
|
||||
option(X_TOOLS_ENABLE_APP_ASSISTANTS "Enable assistant applications" OFF)
|
||||
if(X_TOOLS_ENABLE_APP_ASSISTANTS)
|
||||
add_subdirectory(${CMAKE_SOURCE_DIR}/Source/Assistants)
|
||||
endif()
|
||||
|
||||
option(X_TOOLS_ENABLE_APP_MODBUS_STUDIO "Enable Modbus Studio application" OFF)
|
||||
if(X_TOOLS_ENABLE_APP_MODBUS_STUDIO)
|
||||
add_subdirectory(${CMAKE_SOURCE_DIR}/Source/ModbusStudio)
|
||||
endif()
|
||||
|
||||
option(X_TOOLS_ENABLE_APP_CANBUS_STUDIO "Enable CANBus Studio application" OFF)
|
||||
if(X_TOOLS_ENABLE_APP_CANBUS_STUDIO)
|
||||
add_subdirectory(${CMAKE_SOURCE_DIR}/Source/CANBusStudio)
|
||||
endif()
|
||||
|
||||
@ -7,17 +7,6 @@ list(APPEND ALL_SOURCE ${X_TOOLS_COMMOM_SOURCE_H})
|
||||
list(APPEND ALL_SOURCE ${X_TOOLS_COMMOM_SOURCE_UI})
|
||||
list(APPEND ALL_SOURCE ${X_TOOLS_COMMOM_SOURCE_CPP})
|
||||
|
||||
# -------------------------------------------------------------------------------------------------
|
||||
# BLE module
|
||||
if(NOT X_TOOLS_BLUETOOTH_MODULE_IS_VALID)
|
||||
set(COMMON_PATH ${CMAKE_SOURCE_DIR}/Source/Common)
|
||||
list(REMOVE_ITEM ALL_SOURCE ${COMMON_PATH}/Common/xToolsBleScanner.h)
|
||||
list(REMOVE_ITEM ALL_SOURCE ${COMMON_PATH}/Common/xToolsBleScanner.cpp)
|
||||
list(REMOVE_ITEM ALL_SOURCE ${COMMON_PATH}/CommonUI/xToolsBleDeviceInfoComboBox.h)
|
||||
list(REMOVE_ITEM ALL_SOURCE ${COMMON_PATH}/CommonUI/xToolsBleDeviceInfoComboBox.cpp)
|
||||
message(STATUS "The common BLE module source has been removed!")
|
||||
endif()
|
||||
|
||||
add_library(xToolsCommon STATIC ${ALL_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/xToolsCommon.qrc)
|
||||
target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Core)
|
||||
target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Gui)
|
||||
@ -27,8 +16,5 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
|
||||
target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::SerialPort)
|
||||
target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::SerialBus)
|
||||
endif()
|
||||
if(X_TOOLS_BLUETOOTH_MODULE_IS_VALID)
|
||||
target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Bluetooth)
|
||||
endif()
|
||||
|
||||
x_tools_generate_translations(xToolsCommon)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user