Skip to content

Commit aceca0b

Browse files
committed
Try to use MSVC compiler
1 parent c2c91ee commit aceca0b

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ jobs:
2727
include:
2828
- os: windows-latest
2929
arch: x64
30+
CMAKE_ARCH_FLAG: --preset=x64-windows
3031
- os: windows-latest
3132
arch: x86
32-
CMAKE_ARCH_FLAG: -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32" -DVCPKG_TARGET_TRIPLET=x86-windows
33+
CMAKE_ARCH_FLAG: --preset=x86-windows
3334
- os: ubuntu-20.04
3435
arch: x86
3536
CMAKE_ARCH_FLAG: -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32" -DVCPKG_TARGET_TRIPLET=x86-linux

CMakePresets.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,26 @@
33
"configurePresets": [
44
{
55
"name": "vcpkg",
6-
"generator": "Ninja",
76
"binaryDir": "${sourceDir}/build",
87
"cacheVariables": {
98
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
109
"BUILD_SHARED_LIBS": "OFF"
1110
}
11+
},
12+
{
13+
"name": "x64-windows",
14+
"inherits": "vcpkg",
15+
"architecture": "x64"
16+
},
17+
{
18+
"name": "x86-windows",
19+
"inherits": "vcpkg",
20+
"architecture": "x86"
21+
},
22+
{
23+
"name": "unix",
24+
"inherits": "vcpkg",
25+
"generator": "Ninja"
1226
}
1327
]
1428
}

0 commit comments

Comments
 (0)