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:
Qsaker 2023-11-20 16:59:03 +08:00
parent 36503cbae7
commit ac1c98d8bc
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@ -1,4 +1,5 @@
---
BasedOnStyle: WebKit
Language: Cpp
AccessModifierOffset: -4
AlignAfterOpenBracket: Align

14
.cmake/sak_common.cmake
View File

@ -63,11 +63,21 @@ function(sak_add_executable target sources)
set(INDEX 0)
while(INDEX LESS ${ARGC})
math(EXPR INDEX "${INDEX} + 1")
target_sources(${target} PRIVATE ${ARGV${INDEX}})
math(EXPR INDEX "${INDEX} + 1")
target_sources(${target} PRIVATE ${ARGV${INDEX}})
endwhile()
if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(${target})
endif()
endfunction()
function(sak_set_target_properties target)
set_target_properties(
${target}
PROPERTIES ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION
MACOSX_BUNDLE TRUE
WIN32_EXECUTABLE TRUE
${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
endfunction()

8
CMakeLists.txt
View File

@ -119,18 +119,12 @@ list(APPEND SAK_APP_SOURCES ${SAK_ASSISTANT_SOURCES} ${SAK_SRC_SOURCES} ${APP_SO
list(APPEND SAK_APP_SOURCES qtswissarmyknife.qrc windows.rc)
sak_add_executable("QtSwissArmyKnife" ${SAK_APP_SOURCES})
sak_auto_execute_deployqt(QtSwissArmyKnife)
sak_set_target_properties(QtSwissArmyKnife)
target_link_libraries(
QtSwissArmyKnife
PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::WebSockets
Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::SerialPort
Qt${QT_VERSION_MAJOR}::SerialBus Qt${QT_VERSION_MAJOR}::Bluetooth)
set_target_properties(
QtSwissArmyKnife
PROPERTIES ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION
MACOSX_BUNDLE TRUE
WIN32_EXECUTABLE TRUE
${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
install(
TARGETS QtSwissArmyKnife
BUNDLE DESTINATION .

8
src/assistants/CMakeLists.txt
View File

@ -24,14 +24,8 @@ macro(sak_add_assistant app_name)
${CMAKE_SOURCE_DIR}/qtswissarmyknife.qrc)
sak_add_executable(${app_name} ${APP_ASSISTANT_SOURCES})
sak_auto_execute_deployqt(${app_name})
sak_set_target_properties(${app_name})
target_link_libraries(${app_name} PRIVATE ${APP_ASSISITANT_OWN_LIBS})
set_target_properties(
${app_name}
PROPERTIES ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION
MACOSX_BUNDLE TRUE
WIN32_EXECUTABLE TRUE
${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
endif()
endmacro()