Merge topic 'update_cuda_to_not_pass_wconversion_to_gcc'

e5f1479e Wconversion won't be past to CUDA when it is using GCC.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1569

CMake/VTKmCompilerFlags.cmake

@@ -120,12 +120,14 @@ elseif(VTKM_COMPILER_IS_ICC)
 
 elseif(VTKM_COMPILER_IS_GNU OR VTKM_COMPILER_IS_CLANG)
   set(cxx_flags -Wall -Wcast-align -Wchar-subscripts -Wextra -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused-parameter -fno-common)
+  set(cuda_flags -Xcompiler=-Wall,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-local-typedefs,-Wno-unused-function,-Wcast-align,-Wchar-subscripts,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-Wunused-parameter,-fno-common)
   if (VTKM_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.99)
     list(APPEND cxx_flags -Wfloat-conversion)
+    set(cuda_flags "${cuda_flags},-Wfloat-conversion")
   elseif (VTKM_COMPILER_IS_CLANG)
     list(APPEND cxx_flags -Wconversion)
+    set(cuda_flags "${cuda_flags},-Wconversion")
   endif()
-  set(cuda_flags -Xcompiler=-Wall,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-local-typedefs,-Wno-unused-function,-Wcast-align,-Wconversion,-Wchar-subscripts,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-Wunused-parameter,-fno-common)
 
   #GCC 5, 6 don't properly handle strict-overflow suppression through pragma's.
   #Instead of suppressing around the location of the strict-overflow you