CUDA: MSVC + NVCC support --compiler-options compiler flag

Fixes #20164
2020-01-02 14:35:24 -05:00 · 2020-01-02 14:35:24 -05:00 · 568298a336
commit 568298a336
parent 47a907413b
2 changed files with 21 additions and 1 deletions
--- a/Templates/MSBuild/FlagTables/v10_Cuda.json
+++ b/Templates/MSBuild/FlagTables/v10_Cuda.json
@ -19,6 +19,26 @@
      "SpaceAppendable"
    ]
  },
+  {
+    "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",
--- 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}>>
  )