Skip to content

Commit 9899180

Browse files
author
Vasil Pashov
committed
Use older msvc
1 parent 86f5c71 commit 9899180

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/build_steps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180
CMAKE_C_COMPILER: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120\\bin\\Hostx64\\x64\\cl.exe"
181181
working-directory: ${{github.workspace}}/cpp
182182
run: |
183-
"./vcpkg/vcpkg-bootstrap.bat"
183+
"./vcpkg/bootstrap-vcpkg.bat"
184184
"$VSVARS_ALL_PATH/vcvars64.bat"
185185
cmake --preset ${{env.ARCTIC_CMAKE_PRESET}} -DCMAKE_CXX_COMPILER="${{env.CXX}}"
186186

cpp/CMakePresets.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@
6363
"generator": "Ninja",
6464
"environment": { "cmakepreset_expected_host_system": "Windows" },
6565
"cacheVariables": {
66-
"ARCTICDB_USE_PCH": "ON"
66+
"ARCTICDB_USE_PCH": "ON",
67+
"VCPKG_OVERLAY_TRIPLETS": "custom-triplets",
68+
"VCPKG_TARGET_TRIPLET": "x64-windows-static-1441",
69+
"VCPKG_HOST_TRIPLET": "x64-windows-static-1441"
6770
}
6871
},
6972
{
@@ -80,8 +83,7 @@
8083
},
8184
"cacheVariables": {
8285
"CMAKE_C_COMPILER": "cl",
83-
"CMAKE_CXX_COMPILER": "cl",
84-
"VCPKG_TARGET_TRIPLET": "x64-windows-static"
86+
"CMAKE_CXX_COMPILER": "cl"
8587
}
8688
},
8789
{

0 commit comments

Comments
 (0)