Skip to content

Build IO with v145 of the MSVC toolchain by default #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ccptoebeans wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Build IO with v145 of the MSVC toolchain by default #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
494404f
Compile with v145 of the MSVC toolchain by default
Mar 19, 2026
db67733
Get path to vsdev.bat file from agent param
Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .teamcity/Windows/Project.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
scriptContent = """
REM unfortunately ninja does not find the VS environment otherwise
REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir
call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64
call "%env.VSDEV_BAT_PATH%" -arch=x64
echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%']
echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%']
echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%']
Expand Down
20 changes: 10 additions & 10 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets"
},
"environment": {
"VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg"
"PATH_TO_VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg"
},
"hidden": true
},
Expand Down Expand Up @@ -43,7 +43,7 @@
"name": "x64-windows",
"inherits": "windows",
"cacheVariables": {
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake"
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake"
},
"hidden": true
},
Expand All @@ -70,35 +70,35 @@
"inherits": "x64-windows",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Internal",
"VCPKG_TARGET_TRIPLET": "x64-windows-internal",
"VCPKG_HOST_TRIPLET": "x64-windows-internal"
"VCPKG_TARGET_TRIPLET": "x64-windows-145-internal",
"VCPKG_HOST_TRIPLET": "x64-windows-145-internal"
}
},
{
"name": "x64-windows-release",
"inherits": "x64-windows",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"VCPKG_TARGET_TRIPLET": "x64-windows-release",
"VCPKG_HOST_TRIPLET": "x64-windows-release"
"VCPKG_TARGET_TRIPLET": "x64-windows-145-release",
"VCPKG_HOST_TRIPLET": "x64-windows-145-release"
}
},
{
"name": "x64-windows-debug",
"inherits": "x64-windows",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"VCPKG_TARGET_TRIPLET": "x64-windows-debug",
"VCPKG_HOST_TRIPLET": "x64-windows-debug"
"VCPKG_TARGET_TRIPLET": "x64-windows-145-debug",
"VCPKG_HOST_TRIPLET": "x64-windows-145-debug"
}
},
{
"name": "x64-windows-trinitydev",
"inherits": "x64-windows",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "TrinityDev",
"VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev",
"VCPKG_HOST_TRIPLET": "x64-windows-trinitydev"
"VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev",
"VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
{
"name": "python3",
"version>=": "3.12.9#1"
"version>=": "3.12.9#4"
},
{
"name": "carbon-core",
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/carbonengine/vcpkg-registry
Open in desktop
Submodule vcpkg-registry updated 39 files
+17 −0 README.md
+1 −1 ports/carbon-resources/portfile.cmake
+1 −2 ports/carbon-resources/vcpkg.json
+1 −1 ports/carbon-scheduler/portfile.cmake
+2 −2 ports/carbon-scheduler/vcpkg.json
+1 −1 ports/greenlet/CMakeLists.txt
+4 −1 ports/greenlet/greenletConfig.cmake
+1 −0 ports/greenlet/vcpkg.json
+0 −12 ports/python3/ccp_customizations/msvc-build-with-v141-and-winsdk-10.0.17763.0.patch
+7 −1 ports/python3/portfile.cmake
+2 −1 ports/python3/vcpkg.json
+1 −1 toolchains/arm64-osx-carbon.cmake
+1 −1 toolchains/arm64-osx-triplet.cmake
+1 −1 toolchains/x64-osx-carbon.cmake
+1 −1 toolchains/x64-osx-triplet.cmake
+58 −0 toolchains/x64-windows-145-carbon.cmake
+4 −0 toolchains/x64-windows-145-triplet.cmake
+1 −1 toolchains/x64-windows-triplet.cmake
+5 −1 triplets/arm64-osx-debug.cmake
+5 −1 triplets/arm64-osx-internal.cmake
+5 −1 triplets/arm64-osx-release.cmake
+5 −1 triplets/arm64-osx-trinitydev.cmake
+5 −1 triplets/x64-osx-debug.cmake
+5 −1 triplets/x64-osx-internal.cmake
+5 −1 triplets/x64-osx-release.cmake
+5 −1 triplets/x64-osx-trinitydev.cmake
+51 −0 triplets/x64-windows-145-debug.cmake
+51 −0 triplets/x64-windows-145-internal.cmake
+51 −0 triplets/x64-windows-145-release.cmake
+51 −0 triplets/x64-windows-145-trinitydev.cmake
+5 −1 triplets/x64-windows-debug.cmake
+5 −1 triplets/x64-windows-internal.cmake
+5 −1 triplets/x64-windows-release.cmake
+5 −1 triplets/x64-windows-trinitydev.cmake
+5 −5 versions/baseline.json
+5 −0 versions/c-/carbon-resources.json
+10 −0 versions/c-/carbon-scheduler.json
+5 −0 versions/g-/greenlet.json
+15 −0 versions/p-/python3.json
2 changes: 1 addition & 1 deletion vendor/github.com/microsoft/vcpkg
Open in desktop
Submodule vcpkg updated 7570 files