diff options
author | Robert Maynard <robert.maynard@kitware.com> | 2020-01-02 19:35:24 (GMT) |
---|---|---|
committer | Robert Maynard <robert.maynard@kitware.com> | 2020-01-02 19:35:24 (GMT) |
commit | 568298a3366d1ddec38cada2378f86f5e9691e65 (patch) | |
tree | b12c75469b3105edfce0a01a9b7e7c7614f60b8c | |
parent | 47a907413bb8aa2394a3003c90775b402b53d35a (diff) | |
download | CMake-568298a3366d1ddec38cada2378f86f5e9691e65.zip CMake-568298a3366d1ddec38cada2378f86f5e9691e65.tar.gz CMake-568298a3366d1ddec38cada2378f86f5e9691e65.tar.bz2 |
CUDA: MSVC + NVCC support --compiler-options compiler flag
Fixes #20164
-rw-r--r-- | Templates/MSBuild/FlagTables/v10_Cuda.json | 20 | ||||
-rw-r--r-- | Tests/CudaOnly/WithDefs/CMakeLists.txt | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/Templates/MSBuild/FlagTables/v10_Cuda.json b/Templates/MSBuild/FlagTables/v10_Cuda.json index 1831b8a..b3230ac 100644 --- a/Templates/MSBuild/FlagTables/v10_Cuda.json +++ b/Templates/MSBuild/FlagTables/v10_Cuda.json @@ -20,6 +20,26 @@ ] }, { + "name": "AdditionalCompilerOptions", + "switch": "-compiler-options=", + "comment": "Host compiler options", + "value": "", + "flags": [ + "UserValue", + "SpaceAppendable" + ] + }, + { + "name": "AdditionalCompilerOptions", + "switch": "-compiler-options", + "comment": "Host compiler options", + "value": "", + "flags": [ + "UserFollowing", + "SpaceAppendable" + ] + }, + { "name": "CudaRuntime", "switch": "cudart=none", "comment": "No CUDA runtime library", diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt index 00fd7d2..ba9bf04 100644 --- a/Tests/CudaOnly/WithDefs/CMakeLists.txt +++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt @@ -28,7 +28,7 @@ target_compile_options(CudaOnlyWithDefs PRIVATE -DFLAG_COMPILE_LANG_$<COMPILE_LANGUAGE> -DFLAG_LANG_IS_CUDA=$<COMPILE_LANGUAGE:CUDA> - -Xcompiler=-DHOST_DEFINE + --compiler-options=-DHOST_DEFINE $<$<CONFIG:DEBUG>:$<BUILD_INTERFACE:${debug_compile_flags}>> ) |