修复cmake未传递编译选项的问题

plos-clan · Oct 31, 2024 · 8e8befb · 8e8befb
1 parent 45314f9
commit 8e8befb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -43,8 +43,11 @@ jobs:
           sudo apt install -y nasm mtools qemu-system-i386 libfreetype-dev extra-cmake-modules
 
       - name: Build
-        shell: bash
-        run: ./init.sh
+        run: >
+          ./init.sh
+          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+          -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 
       - name: Upload (clang)
         uses: actions/upload-artifact@v4

diff --git a/init.sh b/init.sh
@@ -118,7 +118,7 @@ check_command mformat '需要使用 mformat 来格式化软盘'
 check_command cmake '需要使用 cmake 来编译项目'
 check_command qemu-img '需要使用 qemu-img 来创建磁盘镜像'
 check_command objcopy '需要使用 objcopy 来处理二进制文件'
-check cmake ..
+check cmake .. $*
 info 开始编译...
 check make make
 cd ..