diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-15 10:42:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-15 10:42:56 (GMT) |
| commit | 17f28f821fca1030fe1a4803e8b50a41bbf3c822 (patch) | |
| tree | 7f277013a28d733f5d73a2f2181698243d33275e | |
| parent | a335999021faa8430a0e33ee70754ebb0c74b117 (diff) | |
| parent | ff086f066b1e4e2bba71eee34d4e821d2f5e9420 (diff) | |
| download | CMake-17f28f821fca1030fe1a4803e8b50a41bbf3c822.zip CMake-17f28f821fca1030fe1a4803e8b50a41bbf3c822.tar.gz CMake-17f28f821fca1030fe1a4803e8b50a41bbf3c822.tar.bz2 | |
Merge topic 'nvcc_host' into release-3.18
ff086f066b NVCC: Handle host compiler with spaces in path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5019
| -rw-r--r-- | Modules/CMakeDetermineCUDACompiler.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake index 692ce20..fa497cd 100644 --- a/Modules/CMakeDetermineCUDACompiler.cmake +++ b/Modules/CMakeDetermineCUDACompiler.cmake @@ -188,7 +188,7 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN) if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA") set(nvcc_test_flags "--keep --keep-dir tmp") if(CMAKE_CUDA_HOST_COMPILER) - string(APPEND nvcc_test_flags " -ccbin=${CMAKE_CUDA_HOST_COMPILER}") + string(APPEND nvcc_test_flags " -ccbin=\"${CMAKE_CUDA_HOST_COMPILER}\"") endif() elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "Clang") if(WIN32) @@ -456,7 +456,7 @@ elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA") "Parsed CUDA nvcc implicit link information from above output:\n${_nvcc_log}\n${log}\n\n") else() file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Failed to parsed CUDA nvcc implicit link information:\n${_nvcc_log}\n\n") + "Failed to parse CUDA nvcc implicit link information:\n${_nvcc_log}\n\n") message(FATAL_ERROR "Failed to extract nvcc implicit link line.") endif() endif() |