From a605aad93c9a9896cd2c9efdbb23d030f1813867 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Mon, 30 Jan 2023 22:47:14 +0100 Subject: cuda: enable C++20 for CUDA 12 https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#cuda-compilers --- mesonbuild/compilers/cuda.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 25a7baf..d008d0c 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -22,7 +22,7 @@ from .. import coredata from .. import mlog from ..mesonlib import ( EnvironmentException, Popen_safe, OptionOverrideProxy, - is_windows, LibType, OptionKey, + is_windows, LibType, OptionKey, version_compare, ) from .compilers import (Compiler, cuda_buildtype_args, cuda_optimization_args, cuda_debug_args) @@ -615,13 +615,26 @@ class CudaCompiler(Compiler): }}''' return self.compiles(t.format_map(fargs), env, extra_args=extra_args, dependencies=dependencies) + _CPP14_VERSION = '>=9.0' + _CPP17_VERSION = '>=11.0' + _CPP20_VERSION = '>=12.0' + def get_options(self) -> 'MutableKeyedOptionDictType': opts = super().get_options() std_key = OptionKey('std', machine=self.for_machine, lang=self.language) ccbindir_key = OptionKey('ccbindir', machine=self.for_machine, lang=self.language) + + cpp_stds = ['none', 'c++03', 'c++11'] + if version_compare(self.version, self._CPP14_VERSION): + cpp_stds += ['c++14'] + if version_compare(self.version, self._CPP17_VERSION): + cpp_stds += ['c++17'] + if version_compare(self.version, self._CPP20_VERSION): + cpp_stds += ['c++20'] + opts.update({ std_key: coredata.UserComboOption('C++ language standard to use with CUDA', - ['none', 'c++03', 'c++11', 'c++14', 'c++17'], 'none'), + cpp_stds, 'none'), ccbindir_key: coredata.UserStringOption('CUDA non-default toolchain directory to use (-ccbin)', ''), }) -- cgit v1.1