Skip to content

Commit b550a54

Browse files
authored
Restore libcudacxx dialect presets. (#6705)
These were removed in #6693.
1 parent 039f22a commit b550a54

1 file changed

Lines changed: 86 additions & 0 deletions

File tree

CMakePresets.json

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,24 @@
128128
"LIBCUDACXX_ENABLE_LIBCUDACXX_TESTS": true
129129
}
130130
},
131+
{
132+
"name": "libcudacxx-cpp17",
133+
"displayName": "libcu++: C++17",
134+
"inherits": "libcudacxx",
135+
"cacheVariables": {
136+
"CMAKE_CXX_STANDARD": "17",
137+
"CMAKE_CUDA_STANDARD": "17"
138+
}
139+
},
140+
{
141+
"name": "libcudacxx-cpp20",
142+
"displayName": "libcu++: C++20",
143+
"inherits": "libcudacxx",
144+
"cacheVariables": {
145+
"CMAKE_CXX_STANDARD": "20",
146+
"CMAKE_CUDA_STANDARD": "20"
147+
}
148+
},
131149
{
132150
"name": "libcudacxx-nvrtc",
133151
"inherits": "libcudacxx",
@@ -136,6 +154,24 @@
136154
"CMAKE_CUDA_ARCHITECTURES": "70"
137155
}
138156
},
157+
{
158+
"name": "libcudacxx-nvrtc-cpp17",
159+
"displayName": "libcu++: NVRTC C++17",
160+
"inherits": "libcudacxx-nvrtc",
161+
"cacheVariables": {
162+
"CMAKE_CXX_STANDARD": "17",
163+
"CMAKE_CUDA_STANDARD": "17"
164+
}
165+
},
166+
{
167+
"name": "libcudacxx-nvrtc-cpp20",
168+
"displayName": "libcu++: NVRTC C++20",
169+
"inherits": "libcudacxx-nvrtc",
170+
"cacheVariables": {
171+
"CMAKE_CXX_STANDARD": "20",
172+
"CMAKE_CUDA_STANDARD": "20"
173+
}
174+
},
139175
{
140176
"name": "cub-base",
141177
"hidden": true,
@@ -333,6 +369,16 @@
333369
"libcudacxx.test.c2h_all"
334370
]
335371
},
372+
{
373+
"name": "libcudacxx-cpp17",
374+
"configurePreset": "libcudacxx-cpp17",
375+
"inherits": "libcudacxx"
376+
},
377+
{
378+
"name": "libcudacxx-cpp20",
379+
"configurePreset": "libcudacxx-cpp20",
380+
"inherits": "libcudacxx"
381+
},
336382
{
337383
"name": "libcudacxx-codegen",
338384
"configurePreset": "libcudacxx-codegen",
@@ -354,6 +400,16 @@
354400
"libcudacxx.nvrtcc"
355401
]
356402
},
403+
{
404+
"name": "libcudacxx-nvrtc-cpp17",
405+
"configurePreset": "libcudacxx-nvrtc-cpp17",
406+
"inherits": "libcudacxx-nvrtc"
407+
},
408+
{
409+
"name": "libcudacxx-nvrtc-cpp20",
410+
"configurePreset": "libcudacxx-nvrtc-cpp20",
411+
"inherits": "libcudacxx-nvrtc"
412+
},
357413
{
358414
"name": "cub-cpp17",
359415
"configurePreset": "cub-cpp17"
@@ -437,6 +493,16 @@
437493
}
438494
}
439495
},
496+
{
497+
"name": "libcudacxx-ctest-cpp17",
498+
"configurePreset": "libcudacxx-cpp17",
499+
"inherits": "libcudacxx-ctest"
500+
},
501+
{
502+
"name": "libcudacxx-ctest-cpp20",
503+
"configurePreset": "libcudacxx-cpp20",
504+
"inherits": "libcudacxx-ctest"
505+
},
440506
{
441507
"name": "libcudacxx-lit",
442508
"configurePreset": "libcudacxx",
@@ -451,11 +517,31 @@
451517
"outputOnFailure": false
452518
}
453519
},
520+
{
521+
"name": "libcudacxx-lit-cpp17",
522+
"configurePreset": "libcudacxx-cpp17",
523+
"inherits": "libcudacxx-lit"
524+
},
525+
{
526+
"name": "libcudacxx-lit-cpp20",
527+
"configurePreset": "libcudacxx-cpp20",
528+
"inherits": "libcudacxx-lit"
529+
},
454530
{
455531
"name": "libcudacxx-nvrtc",
456532
"configurePreset": "libcudacxx-nvrtc",
457533
"inherits": "libcudacxx-lit"
458534
},
535+
{
536+
"name": "libcudacxx-nvrtc-cpp17",
537+
"configurePreset": "libcudacxx-nvrtc-cpp17",
538+
"inherits": "libcudacxx-nvrtc"
539+
},
540+
{
541+
"name": "libcudacxx-nvrtc-cpp20",
542+
"configurePreset": "libcudacxx-nvrtc-cpp20",
543+
"inherits": "libcudacxx-nvrtc"
544+
},
459545
{
460546
"name": "cub-base",
461547
"hidden": true,

0 commit comments

Comments
 (0)