Minor cleanups

This commit is contained in:
Allison Piper
2024-04-06 13:19:14 +00:00
parent 476ed2ceae
commit 4b309e6ad8
2 changed files with 2 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
cuda_prev_min: &cuda_prev_min '11.1' # Does not support the CUPTI APIs we uses (added in 11.3)
cuda_prev_min: &cuda_prev_min '11.1' # Does not support the CUPTI APIs we use (added in 11.3)
cuda_prev_max: &cuda_prev_max '11.8'
cuda_curr_min: &cuda_curr_min '12.0'
cuda_curr_max: &cuda_curr_max '12.4'
@@ -26,7 +26,6 @@ llvm15: &llvm15 { name: 'llvm', version: '15', exe: 'clang++' }
llvm16: &llvm16 { name: 'llvm', version: '16', exe: 'clang++' }
# MSVC configs
msvc2017: &msvc2017 { name: 'cl', version: '14.16', exe: 'cl++' }
msvc2019: &msvc2019 { name: 'cl', version: '14.29', exe: 'cl++' }
msvc2022: &msvc2022 { name: 'cl', version: '14.39', exe: 'cl++' }

View File

@@ -29,7 +29,6 @@ function(nvbench_add_cxx_flag target_name type flag)
target_compile_options(${target_name} ${type}
$<$<COMPILE_LANGUAGE:CXX>:${flag}>
$<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:-Xcompiler=${flag}>
# FIXME nvc++ case
)
endif()
endfunction()
@@ -64,7 +63,7 @@ else()
endif()
endif()
# Experimental ilesystem library
# Experimental filesystem library
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
target_link_libraries(nvbench.build_interface INTERFACE stdc++fs)
endif()