commit 069c1bd908aeae6263fdb735b76760cd9dad67a7
author Brad King <brad.king@kitware.com> Tue Oct 17 10:47:14 2017 -0400
committer Brad King <brad.king@kitware.com> Tue Oct 17 10:47:14 2017 -0400
tree c10cbcf186acb8824f4902ada8b52f544b76cd0e
parent 5a25bda524f004c4b2b954b38c2898094cdb83a4
parent fd90a14f1b98b44dc29a27a46d44d4405a7b0faa

Merge branch 'vs-cuda-machine' into release-3.10

Merge-request: !1390

Source/cmVisualStudio10TargetGenerator.cxx

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 0087957..c61902a 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2648,6 +2648,13 @@
     cudaOptions.AddFlag("CompileOut", "$(IntDir)%(Filename).ptx");
   }
 
+  // CUDA automatically passes the proper '--machine' flag to nvcc
+  // for the current architecture, but does not reflect this default
+  // in the user-visible IDE settings.  Set it explicitly.
+  if (this->Platform == "x64") {
+    cudaOptions.AddFlag("TargetMachinePlatform", "64");
+  }
+
   // Convert the host compiler options to the toolset's abstractions
   // using a secondary flag table.
   cudaOptions.ClearTables();