File tree Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Original file line number Diff line number Diff line change 27
27
include :
28
28
- os : windows-latest
29
29
arch : x64
30
+ CMAKE_ARCH_FLAG : --preset=x64-windows
30
31
- os : windows-latest
31
32
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
33
34
- os : ubuntu-20.04
34
35
arch : x86
35
36
CMAKE_ARCH_FLAG : -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32" -DVCPKG_TARGET_TRIPLET=x86-linux
Original file line number Diff line number Diff line change 3
3
"configurePresets" : [
4
4
{
5
5
"name" : " vcpkg" ,
6
- "generator" : " Ninja" ,
7
6
"binaryDir" : " ${sourceDir}/build" ,
8
7
"cacheVariables" : {
9
8
"CMAKE_TOOLCHAIN_FILE" : " $env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" ,
10
9
"BUILD_SHARED_LIBS" : " OFF"
11
10
}
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"
12
26
}
13
27
]
14
28
}
You can’t perform that action at this time.
0 commit comments