From b98f1e7a6dc92251ed64781e03ee7165cc4bea67 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: Mon, 9 Oct 2023 19:48:43 +0800 Subject: [PATCH] cmake: update submodule --- .github/workflows/ci.yml | 10 ++++++---- cmake | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a444cbc3..9feb13f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,14 @@ jobs: name: Build strategy: matrix: - qt-version: [5.15.2, 6.5.1] + qt-version: [5.15.2, 6.5.3] library-type: [shared, static] platform: [windows-latest, ubuntu-latest, macos-latest] include: - platform: windows-latest - CC: cl - CXX: cl - LD: link + CC: cl.exe + CXX: cl.exe + LD: link.exe EXTRA_FLAGS: -DFRAMELESSHELPER_ENABLE_SPECTRE=ON -DFRAMELESSHELPER_ENABLE_EHCONTGUARD=ON -DFRAMELESSHELPER_ENABLE_INTELCET=ON -DFRAMELESSHELPER_ENABLE_CFGUARD=ON - platform: ubuntu-latest CC: gcc @@ -73,6 +73,8 @@ jobs: - name: Install macOS dependencies if: ${{ matrix.platform == 'macos-latest' }} run: | + brew update + brew upgrade brew install llvm export PATH="/usr/local/opt/llvm/bin:$PATH" diff --git a/cmake b/cmake index e627edc1..e15d7d9b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit e627edc1a30193dfd4437da2b184cdcd050b8162 +Subproject commit e15d7d9bf98de4ba8aa7d89c505164711ee7d8aa