Skip to content

Commit 021f27d

Browse files
committed
[简化CMake配置并优化CI触发规则]: 移除所有子项目的MANUAL_FINALIZATION标记和qt_finalize_executable调用,简化CMake配置,同时调整CI工作流触发规则
- **CMake配置简化**: 移除20多个子项目CMakeLists.txt中的MANUAL_FINALIZATION标记和对应的qt_finalize_executable调用,使用Qt默认的自动终结化流程 - **CI触发规则优化**: 调整cmake.yml工作流的触发条件,不再忽略.txt文件的变更,确保文本配置文件的修改也能触发构建 - **构建系统标准化**: 统一所有子项目的可执行文件创建方式,简化维护复杂度,提高构建一致性 - **项目结构清理**: 消除冗余的CMake指令,使构建配置更加简洁清晰,便于后续维护和扩展
1 parent 8cbec8b commit 021f27d

31 files changed

Lines changed: 29 additions & 63 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
- 'qmake/**'
99
- 'translations/**'
1010
- '**/*.md'
11-
- '**/*.txt'
1211
- '**/.clang-*'
1312
- '**/.gitignore'
1413
- '**/*.pri'
@@ -22,7 +21,6 @@ on:
2221
- 'qmake/**'
2322
- 'translations/**'
2423
- '**/*.md'
25-
- '**/*.txt'
2624
- '**/.clang-*'
2725
- '**/.gitignore'
2826
- '**/*.pri'

src/AutoStartManager/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ else()
88
list(APPEND PROJECT_SOURCES autostartmanager_linux.cc)
99
endif()
1010

11-
qt_add_executable(AutoStartManager MANUAL_FINALIZATION ${PROJECT_SOURCES})
11+
qt_add_executable(AutoStartManager ${PROJECT_SOURCES})
1212
target_link_libraries(AutoStartManager PRIVATE Qt::Widgets)
13-
qt_finalize_executable(AutoStartManager)

src/Battery/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROJECT_SOURCES main.cpp mainwindow.cpp mainwindow.h batterywidget.h
22
batterywidget.cpp)
33

4-
qt_add_executable(Battery MANUAL_FINALIZATION ${PROJECT_SOURCES})
4+
qt_add_executable(Battery ${PROJECT_SOURCES})
55
target_link_libraries(Battery PRIVATE Qt::Widgets)
6-
qt_finalize_executable(Battery)

src/BatteryQuick/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
qt_add_executable(appBatteryQuick main.cc)
22
target_link_libraries(appBatteryQuick PRIVATE Qt::Quick)
3-
qt_finalize_executable(Battery)
43

54
qt_add_qml_module(
65
appBatteryQuick

src/Bubble/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ set(PROJECT_SOURCES
77
mainwindow.cpp
88
mainwindow.h)
99

10-
qt_add_executable(Bubble MANUAL_FINALIZATION ${PROJECT_SOURCES})
10+
qt_add_executable(Bubble ${PROJECT_SOURCES})
1111
target_link_libraries(Bubble PRIVATE Qt::Widgets)
12-
qt_finalize_executable(Bubble)

src/Chart/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ set(PROJECT_SOURCES
2525
stackedbarchart.h
2626
stackedbarchart.cpp)
2727

28-
qt_add_executable(Chart MANUAL_FINALIZATION ${PROJECT_SOURCES})
28+
qt_add_executable(Chart ${PROJECT_SOURCES})
2929
target_link_libraries(Chart PRIVATE Qt::Widgets Qt::Charts)
30-
qt_finalize_executable(Chart)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROJECT_SOURCES checkabletreeitem.hpp checkabletreeitem.cc main.cc
22
mainwindow.cc mainwindow.hpp)
33

4-
qt_add_executable(CheckableTreeItem MANUAL_FINALIZATION ${PROJECT_SOURCES})
4+
qt_add_executable(CheckableTreeItem ${PROJECT_SOURCES})
55
target_link_libraries(CheckableTreeItem PRIVATE Qt::Widgets)
6-
qt_finalize_executable(CheckableTreeItem)

src/Clock/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROJECT_SOURCES main.cpp mainwindow.cpp mainwindow.h clockwidget.h
22
clockwidget.cpp)
33

4-
qt_add_executable(Clock MANUAL_FINALIZATION ${PROJECT_SOURCES})
4+
qt_add_executable(Clock ${PROJECT_SOURCES})
55
target_link_libraries(Clock PRIVATE Qt::Widgets)
6-
qt_finalize_executable(Clock)

src/DashBoard/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROJECT_SOURCES main.cpp mainwindow.cpp mainwindow.h dashboardwidget.h
22
dashboardwidget.cpp)
33

4-
qt_add_executable(DashBoard MANUAL_FINALIZATION ${PROJECT_SOURCES})
4+
qt_add_executable(DashBoard ${PROJECT_SOURCES})
55
target_link_libraries(DashBoard PRIVATE Qt::Widgets)
6-
qt_finalize_executable(DashBoard)

src/GridViewModel/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ set(PROJECT_SOURCES
77
mainwindow.cpp
88
mainwindow.h)
99

10-
qt_add_executable(GridViewModel MANUAL_FINALIZATION ${PROJECT_SOURCES})
10+
qt_add_executable(GridViewModel ${PROJECT_SOURCES})
1111
target_link_libraries(GridViewModel PRIVATE Qt::Widgets)
12-
qt_finalize_executable(GridViewModel)

0 commit comments

Comments
 (0)