From 31e0ab2c7091362acf51e6c299c6f63c9696675f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 27 Oct 2023 16:06:01 +0800 Subject: [PATCH] GHA CI: don't override cmake default CXXFLAGS --- .github/workflows/ci_windows.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index 37900f7f5..4f8a1ee00 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -90,11 +90,12 @@ jobs: --recurse-submodules ` https://github.com/arvidn/libtorrent.git cd libtorrent + $env:CXXFLAGS+=" /guard:cf" + $env:LDFLAGS+=" /guard:cf" cmake ` -B build ` -G "Ninja" ` -DCMAKE_BUILD_TYPE=RelWithDebInfo ` - -DCMAKE_CXX_FLAGS=/guard:cf ` -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ` -DCMAKE_INSTALL_PREFIX="${{ env.libtorrent_path }}" ` -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" ` @@ -108,11 +109,11 @@ jobs: - name: Build qBittorrent run: | + $env:CXXFLAGS+=" /WX" cmake ` -B build ` -G "Ninja" ` -DCMAKE_BUILD_TYPE=RelWithDebInfo ` - -DCMAKE_CXX_FLAGS="/WX" ` -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ` -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" ` -DBOOST_ROOT="${{ env.boost_path }}" `