Skip to content
Draft
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ jobs:
- windows-ninja-clang-x64
- windows-ninja-clangcl-x64
- windows-fastbuild-msvc-x64
- windows-vs2022-x64
- windows-vs2022-arm64
- windows-vs2026-x64
- windows-vs2026-arm64
include:
- buildPreset: windows-ninja-msvc-x64
cuda: true
- buildPreset: windows-fastbuild-msvc-x64
fastbuild: true
runs-on: windows-latest
runs-on: windows-2025-vs2026
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
11 changes: 4 additions & 7 deletions example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.20)

if(DEFINED ENV{CUDA_PATH})
set(CMAKE_CUDA_COMPILER "$ENV{CUDA_PATH}/bin/nvcc.exe")
set(CMAKE_CUDA_FLAGS_INIT "${CMAKE_CUDA_FLAGS_INIT} -allow-unsupported-compiler")
endif()

project(WindowsToolchainExample)
Expand Down Expand Up @@ -39,14 +40,10 @@ add_subdirectory(SharedLibrary)
add_subdirectory(WindowsApplication)

if((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND (CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64) AND (NOT EWDK))
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.50)
message(WARNING "NVIDIA Cuda Toolkit support requires MSVC toolset version less than 19.50 - skipping Cuda example project.")
if(NOT (DEFINED ENV{CUDA_PATH}))
message(WARNING "NVIDIA Cuda Toolkit not found - please make sure that the 'CUDA_PATH' environment variable is set.")
else()
if(DEFINED ENV{CUDA_PATH})
add_subdirectory(CommandLineCuda)
else()
message(WARNING "NVIDIA Cuda Toolkit not found - please make sure that the 'CUDA_PATH' environment variable is set.")
endif()
add_subdirectory(CommandLineCuda)
endif()
endif()

Expand Down
35 changes: 35 additions & 0 deletions example/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,33 @@
"CMAKE_SYSTEM_PROCESSOR": "ARM64"
}
},
{
"name": "windows-vs2026",
"inherits": "windows",
"hidden": true,
"generator": "Visual Studio 18 2026",
"cacheVariables": {
"CMAKE_SYSTEM_NAME": "Windows"
}
},
{
"name": "windows-vs2026-x64",
"inherits": "windows-vs2026",
"hidden": false,
"cacheVariables": {
"CMAKE_GENERATOR_PLATFORM": "x64,version=10.0.26100.0",
"CMAKE_SYSTEM_PROCESSOR": "AMD64"
}
},
{
"name": "windows-vs2026-arm64",
"inherits": "windows-vs2026",
"hidden": false,
"cacheVariables": {
"CMAKE_GENERATOR_PLATFORM": "ARM64,version=10.0.26100.0",
"CMAKE_SYSTEM_PROCESSOR": "ARM64"
}
},
{
"name": "linux-windows",
"inherits": ["default"],
Expand Down Expand Up @@ -255,6 +282,14 @@
"name": "windows-vs2022-arm64",
"configurePreset": "windows-vs2022-arm64"
},
{
"name": "windows-vs2026-x64",
"configurePreset": "windows-vs2026-x64"
},
{
"name": "windows-vs2026-arm64",
"configurePreset": "windows-vs2026-arm64"
},
{
"name": "linux-windows-ninja-clang-arm64",
"configurePreset": "linux-windows-ninja-clang-arm64"
Expand Down
6 changes: 4 additions & 2 deletions example/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
param (
[ValidateSet('windows-ninja-msvc-x64', 'windows-ninja-msvc-x64-spectre', 'windows-ninja-msvc-x86',
'windows-ninja-msvc-arm64', 'windows-ninja-msvc-host', 'windows-ninja-clang-x64',
'windows-ninja-clangcl-x64', 'windows-fastbuild-msvc-x64', 'windows-vs2022-x64',
'windows-vs2022-arm64')]
'windows-ninja-clangcl-x64', 'windows-fastbuild-msvc-x64',
'windows-vs2022-x64', 'windows-vs2022-arm64',
'windows-vs2026-x64', 'windows-vs2026-arm64'
)]
$Presets = @('windows-ninja-msvc-host'),

[ValidateSet('Debug', 'Release', 'RelWithDebInfo')]
Expand Down