Skip to content

Commit

Permalink
CMake Presets: Remove windows-x86 and windows-x64 and replace it with…
Browse files Browse the repository at this point in the history
… windows.

Ninja does not support setting of the machine type. Instead the appropriate VS setup script must be executed beforehand.

VS2022 targets are kept as they support this.
  • Loading branch information
Ghabry committed Oct 14, 2024
1 parent 579926c commit a39be32
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions builds/cmake/CMakePresets.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
}
},
{
"name": "windows-x86",
"displayName": "Windows (x86)",
"name": "windows",
"displayName": "Windows",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "x86-windows-static"
"VCPKG_TARGET_TRIPLET": "$env{VSCMD_ARG_TGT_ARCH}-windows-static"
},
"inherits": "win-user"
},
Expand All @@ -39,15 +39,6 @@
},
"inherits": "win-user"
},
{
"name": "windows-x64",
"displayName": "Windows (x64)",
"architecture": "x64",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "x64-windows-static"
},
"inherits": "win-user"
},
{
"name": "windows-x64-vs2022",
"displayName": "Windows (x64) using Visual Studio 2022",
Expand Down

0 comments on commit a39be32

Please sign in to comment.