diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-01-03 16:27:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-03 16:27:52 (GMT) |
| commit | 2c95cb3c2e99c5a6f58ca30195ac407ac164b336 (patch) | |
| tree | 10be034e07220bbe6ffeb01eef8adce869fbb34f | |
| parent | e7f3db6463460306b4ca56754d4f29638095b750 (diff) | |
| parent | 568298a3366d1ddec38cada2378f86f5e9691e65 (diff) | |
| download | CMake-2c95cb3c2e99c5a6f58ca30195ac407ac164b336.zip CMake-2c95cb3c2e99c5a6f58ca30195ac407ac164b336.tar.gz CMake-2c95cb3c2e99c5a6f58ca30195ac407ac164b336.tar.bz2 | |
Merge topic 'msvc_support_nvcc--compiler-options'
568298a336 CUDA: MSVC + NVCC support --compiler-options compiler flag
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4177
| -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}>> ) |