From 326630ef1d14c01b300e1265c68d77aa591fd922 Mon Sep 17 00:00:00 2001 From: Stepanov Igor Date: Sun, 15 Dec 2024 02:29:59 +0300 Subject: [PATCH] Check config working --- .github/workflows/windows-clang.yml | 7 ++++--- CMakePresets.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index 102557e8..b224d098 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -1,8 +1,8 @@ name: Windows Build (CLang) on: - push: - branches: [ "main", "release-**"] + # push: + # branches: [ "main", "release-**"] pull_request: branches: [ "main" ] @@ -43,11 +43,12 @@ jobs: - name: Configure project with CMake and vcpkg shell: msys2 {0} run: | + export VCPKG_ROOT=./vcpkg export VCPKG_DEFAULT_TRIPLET=x64-mingw-static export VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-static mkdir build cd build - cmake -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON .. + cmake --preset default-windows -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DCMAKE_BUILD_TYPE=Release .. cmake --build . --config Release - name: Package for Windows run: | diff --git a/CMakePresets.json b/CMakePresets.json index 61c1ab30..7c5a3d37 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,7 +2,7 @@ "version": 6, "configurePresets": [ { - "name": "windows-default", + "name": "default-windows", "condition": { "type": "equals", "rhs": "${hostSystemName}",