Skip to content

Commit 95e1495

Browse files
authored
Merge pull request #10 from hananiahhsu/Development_Hananiah
#9】fix the issue:Failure of ci build #9
2 parents dfc09ef + 0d76b39 commit 95e1495

4 files changed

Lines changed: 31 additions & 15 deletions

File tree

.github/workflows/c-cpp.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
16-
- name: configure
17-
run: ./configure
18-
- name: make
19-
run: make
20-
- name: make check
21-
run: make check
22-
- name: make distcheck
23-
run: make distcheck
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
with:
18+
submodules: recursive
19+
20+
- name: Configure with CMake (headless)
21+
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DSD_BUILD_DESIGNER=OFF -DSD_BUILD_DEMOS=OFF
22+
23+
- name: Build
24+
run: cmake --build build --config Release --parallel

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[submodule "Alice"]
22
path = Alice
3-
url = git@github.com:hananiahhsu/Alice.git
3+
url = https://github.com/hananiahhsu/Alice.git
44
branch = main
55
[submodule "ToolChain"]
6-
url = git@github.com:ToshihideMaskawa/ToolChain.git
6+
url = https://github.com/ToshihideMaskawa/ToolChain.git
77
path = ToolChain
88
branch = main

CMakeLists.txt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,13 @@ set(SPDLOG_FMT_EXTERNAL OFF CACHE BOOL "" FORCE)
225225
#-----------------------------------------------------------------------------
226226
# 定义源代码的路径
227227
#-----------------------------------------------------------------------------
228-
# APPS 目录
229-
add_subdirectory(Designer)
228+
# APPS 目录(可选:需要 Qt)
229+
option(SD_BUILD_DESIGNER "Build the SolidDesigner GUI application (requires Qt)" ON)
230+
if(SD_BUILD_DESIGNER)
231+
add_subdirectory(Designer)
232+
else()
233+
message(STATUS "Skipping Designer application build (SD_BUILD_DESIGNER=OFF)")
234+
endif()
230235

231236
# 平台层
232237
add_subdirectory(Alice)
@@ -237,7 +242,14 @@ add_subdirectory(externals)
237242
# 单元测试
238243
add_subdirectory(UnitTest)
239244

240-
# Internal demos
241-
add_subdirectory(Demos)
245+
# Internal demos(可选:部分示例依赖 Qt)
246+
option(SD_BUILD_DEMOS "Build demo targets (some require Qt)" ON)
247+
if(SD_BUILD_DEMOS)
248+
add_subdirectory(Demos)
249+
else()
250+
message(STATUS "Skipping demo targets (SD_BUILD_DEMOS=OFF)")
251+
endif()
252+
253+
242254

243255
message("*--*--*--*--*--*--*--*--*--*--*--End Top Level CmakeList--*--*--*--*--*--*--*--*--*--*--*--*--*")

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Physical Structure
6868
|
6969
|----- Alice (submodule)
7070
| |
71+
| |---- Bootstrap
7172
| |---- Core
7273
| |---- Data
7374
| |---- Interaction
@@ -79,6 +80,7 @@ Physical Structure
7980
|-- DATA
8081
|-- Interaction
8182
|-- UI
83+
|-- Plugins
8284
```
8385

8486
### Layered Architecture (high‑level)
@@ -199,6 +201,7 @@ cmake -S . -B build -G Ninja \
199201

200202
cmake --build build --parallel
201203
cmake --install build
204+
**Headless/CI builds**: If you don't have Qt available, disable the GUI target with `-DSD_BUILD_DESIGNER=OFF`.
202205
```
203206
204207
Run the app (paths may differ):

0 commit comments

Comments
 (0)