From 41068dbbc9d63b578d400b117b6d58ab918fba13 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Mon, 24 Aug 2026 16:03:04 +0000 Subject: [PATCH 1/4] Switch to using v145 as the default compiler for Windows --- .teamcity/Windows/Project.kt | 7 +++---- CMakePresets.json | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 423dd24..dcb8862 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -37,7 +37,7 @@ object Project : Project({ }) -class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({ +class CarbonBuildWindows(buildName: String, configType: String, preset: String, vsDevBatSwitches: String = "-arch=x64 -vcvars_ver=14.51") : BuildType({ id(buildName.toId()) this.name = buildName @@ -47,8 +47,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") - select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", - options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") param("env.CMAKE_CONFIG_TYPE", configType) @@ -90,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 "%env.VSDEV_BAT_PATH%" -arch=x64 + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%'] echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%'] echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%'] diff --git a/CMakePresets.json b/CMakePresets.json index c848838..b63a433 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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 }, @@ -70,8 +70,8 @@ "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" } }, { @@ -79,8 +79,8 @@ "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" } }, { @@ -88,8 +88,8 @@ "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" } }, { @@ -97,8 +97,8 @@ "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" } }, { @@ -174,4 +174,4 @@ } } ] -} +} \ No newline at end of file From 999b1a930fb87de01c24c26f3c6c483f375b88da Mon Sep 17 00:00:00 2001 From: filipppavlov Date: Fri, 11 Sep 2026 15:45:39 +0000 Subject: [PATCH 2/4] Update blue dependency --- vcpkg.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index fb36e4a..d85ab50 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,17 +2,13 @@ "dependencies": [ { "name": "carbon-blue", - "version>=": "5.1.2" + "version>=": "6.2.0" } ], "overrides": [ - { - "name": "protobuf", - "version": "3.6.0.1" - }, { "name": "openssl", "version": "1.1.1k#8" } ] -} \ No newline at end of file +} From d72fbf1ad0afe70a12378c424f22c601dbd66e1a Mon Sep 17 00:00:00 2001 From: filipppavlov Date: Fri, 11 Sep 2026 16:06:51 +0000 Subject: [PATCH 3/4] Update vcpkg.json --- vcpkg.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vcpkg.json b/vcpkg.json index d85ab50..0da7f30 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,6 +3,10 @@ { "name": "carbon-blue", "version>=": "6.2.0" + }, + { + "name": "carbon-pdmprotowrapper", + "version>=": "3.0.0#1" } ], "overrides": [ From af5e09ed02be6fed20f5ec4012f60b70c89cec7f Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Wed, 16 Sep 2026 10:17:41 +0000 Subject: [PATCH 4/4] Update carbonengine/vcpkg-registry --- vendor/github.com/carbonengine/vcpkg-registry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index d7d4b17..088e482 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit d7d4b1700f90b2edcc9f1e296f5cdb892f834008 +Subproject commit 088e482dca16680be0b76ce297b21675d56d88cc