Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 35 additions & 9 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
}
},
{
"name": "Windows_x64_Debug",
"name": "Windows_x64_Debug_2022",
"inherits": "BaseOptions",
"displayName": "Windows Visual Studio Debug",
"displayName": "Windows Visual Studio 2022 Debug",
"generator": "Visual Studio 17 2022",
"binaryDir": "Result.Windows.x64.MultiConfig",
"architecture": "x64",
Expand All @@ -69,14 +69,28 @@

},
{
"name": "Windows_x64_Release",
"displayName": "Windows Visual Studio Release",
"inherits": "Windows_x64_Debug",
"name": "Windows_x64_Release_2022",
"displayName": "Windows Visual Studio 2022 Release",
"inherits": "Windows_x64_Debug_2022",
"cacheVariables": {
"CMAKE_CONFIGURATION_TYPES": "Release"
}
},

{
"name": "Windows_x64_Debug_2026",
"inherits": "Windows_x64_Debug_2022",
"displayName": "Windows Visual Studio 2026 Debug",
"generator": "Visual Studio 18 2026"
},

{
"name": "Windows_x64_Release_2026",
"inherits": "Windows_x64_Release_2022",
"displayName": "Windows Visual Studio 2026 Release",
"generator": "Visual Studio 18 2026"
},

{
"name": "Darwin_x64_Debug",
"inherits": "BaseOptions",
Expand Down Expand Up @@ -146,22 +160,34 @@

"buildPresets": [
{
"name": "Windows_x64_Debug",
"configurePreset": "Windows_x64_Debug",
"name": "Windows_x64_Debug_2022",
"configurePreset": "Windows_x64_Debug_2022",
"configuration": "Debug",
"nativeToolOptions": [
"-nodeReuse:false"
]
},
{
"name": "Windows_x64_Release",
"configurePreset": "Windows_x64_Release",
"name": "Windows_x64_Release_2022",
"configurePreset": "Windows_x64_Release_2022",
"configuration": "Release",
"nativeToolOptions": [
"-nodeReuse:false"
]
},

{
"name": "Windows_x64_Debug_2026",
"inherits": "Windows_x64_Debug_2022",
"configurePreset": "Windows_x64_Debug_2026"
},

{
"name": "Windows_x64_Release_2026",
"inherits": "Windows_x64_Release_2022",
"configurePreset": "Windows_x64_Release_2026"
},

{
"name": "Darwin_x64_Debug",
"configuration": "Debug",
Expand Down
10 changes: 8 additions & 2 deletions Scripts/BuildEngine.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ param (
[bool] $VerifyFormatting = $False,

[Parameter(HelpMessage = "VS version use to build, default to 2022")]
[ValidateSet(2022)]
[ValidateSet('2022', '2026')]
[int] $VsVersion = 2022,

[Parameter(HelpMessage = "Build Launcher only")]
Expand Down Expand Up @@ -121,6 +121,10 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
# Define CMake Generator arguments
$configName = $systemName, $architecture, $configuration -join "_"

if($IsWindows){
$configName += '_'+$VsVersion
}

$cMakeArguments = " --preset $configName $cMakeCacheVariableOverride"

# CMake Generation process
Expand All @@ -130,8 +134,9 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
throw "cmake failed generation for '$cMakeArguments' with exit code '$cMakeProcess.ExitCode'"
}


if ($runBuild) {
# CMake Build Process
#

Write-Host "Building $systemName $architecture $configuration"

Expand Down Expand Up @@ -166,6 +171,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
if($installProcess.ExitCode -ne 0){
throw "cmake failed to install to '$install_directory'"
}
}
}


Expand Down