diff options
| author | svidyuk <svidyuk@yandex-team.ru> | 2022-04-13 13:03:46 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.ru> | 2022-04-13 13:03:46 +0300 |
| commit | be87671caa10c195f79380bb8adc41d94a731334 (patch) | |
| tree | 6aab67a0703112dfcbad0c2eb3d9d061d5f80298 | |
| parent | 2f14a0656c686c407bb481a79060d4f4f57e3dac (diff) | |
| download | ydb-be87671caa10c195f79380bb8adc41d94a731334.tar.gz | |
Split CUDA version num from cuda version flag
Separate version number is neede to propagate value to exportd
cmake projects
DEVTOOLS-9035
ref:3006ef8ff4f23129d37d23c37be4215a0a6a00fb
| -rw-r--r-- | build/ymake.core.conf | 10 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index a35ea5f1547..2a29b077aae 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -5896,10 +5896,18 @@ macro _SRC("lua", SRC, SRCFLAGS...) { .PEERDIR=$LUAJIT_PATH } +NVCC_STD_VER=14 +when ($MSVC == "yes") { + NVCC_STD=/std:c++${NVCC_STD_VER} +} +otherwise { + NVCC_STD=-std=c++${NVCC_STD_VER} +} + # tag:src-processing macro _SRC("cu", SRC, SRCFLAGS...) { .CMD=$_SRC_CU_CMD - .SEM=target_cuda_sources PRIVATE ${input:SRC} ${output;hide;suf=${OBJ_SUF}.o:SRC} && add_language CUDA && target_cuda_flags $CUDA_NVCC_FLAGS $NVCC_STD && target_cuda_cflags $USER_CXXFLAGS $NVCC_STD $SRCFLAGS + .SEM=target_cuda_sources PRIVATE ${input:SRC} ${output;hide;suf=${OBJ_SUF}.o:SRC} && add_language CUDA && set_global_flags CMAKE_CUDA_STANDARD ${NVCC_STD_VER} && target_cuda_flags $CUDA_NVCC_FLAGS && target_cuda_cflags $USER_CXXFLAGS $SRCFLAGS .PEERDIR=$_SRC_CU_PEERDIR } diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 735a5ac7f81..7fb1d358f46 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -3022,10 +3022,6 @@ class Cuda(object): self.peerdirs = ['build/platform/cuda'] - self.nvcc_std = '-std=c++14' - if self.build.tc.type == 'msvc': - self.nvcc_std = self.nvcc_std.replace('-std=', '/std:') - self.nvcc_flags = [] if not self.have_cuda.value: @@ -3067,7 +3063,6 @@ class Cuda(object): emit('NVCC_UNQUOTED', self.build.host.exe('$CUDA_ROOT', 'bin', 'nvcc')) emit('NVCC', '${quo:NVCC_UNQUOTED}') - emit('NVCC_STD', self.nvcc_std) emit('NVCC_FLAGS', self.nvcc_flags, '$CUDA_NVCC_FLAGS') emit('NVCC_OBJ_EXT', '.o' if not self.build.target.is_windows else '.obj') |