Merge topic 'add_easy_cuda_flags_to_cmake'

f6ae5f3d CUDA GPU architecture detection now works with MSVC generators.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !285
This commit is contained in:
Robert Maynard 2015-12-10 13:30:47 -05:00 committed by Kitware Robot
commit 9d172652fb

@ -91,7 +91,7 @@ if (VTKm_Base_FOUND)
#detect what the propery is set too
if(VTKm_CUDA_Architecture STREQUAL "native")
#run execute_process to do auto_detection
execute_process(COMMAND "${CUDA_NVCC_EXECUTABLE}" "--run" "${CMAKE_CURRENT_LIST_DIR}/VTKmDetectCUDAVersion.cxx"
execute_process(COMMAND "${CUDA_NVCC_EXECUTABLE}" "-ccbin" "${CMAKE_CXX_COMPILER}" "--run" "${CMAKE_CURRENT_LIST_DIR}/VTKmDetectCUDAVersion.cxx"
RESULT_VARIABLE ran_properly
OUTPUT_VARIABLE run_output)