diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-09 14:26:16 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-09 09:26:20 -0500 |
| commit | bc88329e5ba7b1a14538f23f4fa223ac8d6d5895 (patch) | |
| tree | c0f82a7f529ac1d4dbdc5fdc14f1c7b401095fec /Modules/FindCUDA | |
| parent | 89d12746306571a323549ad0f8d11284999053d5 (diff) | |
| parent | fab1b432eb1207513bee57039ecb21d95f880f89 (diff) | |
| download | cmake-bc88329e5ba7b1a14538f23f4fa223ac8d6d5895.tar.gz | |
Merge topic 'msvc2017-findcuda'
fab1b432 FindCUDA: Update to properly find MSVC 2017 compiler tools
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1631
Diffstat (limited to 'Modules/FindCUDA')
| -rw-r--r-- | Modules/FindCUDA/run_nvcc.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake index a20ef8f7fa..6fc2439ad8 100644 --- a/Modules/FindCUDA/run_nvcc.cmake +++ b/Modules/FindCUDA/run_nvcc.cmake @@ -125,7 +125,7 @@ list(APPEND CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS_${build_configuration}}) list( FIND CUDA_NVCC_FLAGS "-ccbin" ccbin_found0 ) list( FIND CUDA_NVCC_FLAGS "--compiler-bindir" ccbin_found1 ) if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER ) - if (CUDA_HOST_COMPILER STREQUAL "$(VCInstallDir)bin" AND DEFINED CCBIN) + if (CUDA_HOST_COMPILER STREQUAL "@_CUDA_MSVC_HOST_COMPILER@" AND DEFINED CCBIN) set(CCBIN -ccbin "${CCBIN}") else() set(CCBIN -ccbin "${CUDA_HOST_COMPILER}") |