diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-15 18:47:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-15 18:47:21 (GMT) |
| commit | d4b8a6b9d654fafe5cbea9c7767e5e6a2e487bc3 (patch) | |
| tree | 882a5942976ae9db1208c6bd0b21c70f0de5ff3a /Modules | |
| parent | 752ab27292b0ed801c1850eebb96b2d9651b839d (diff) | |
| parent | fe45d13a0e7227419f1420d9511f6dcfb085b129 (diff) | |
| download | CMake-d4b8a6b9d654fafe5cbea9c7767e5e6a2e487bc3.zip CMake-d4b8a6b9d654fafe5cbea9c7767e5e6a2e487bc3.tar.gz CMake-d4b8a6b9d654fafe5cbea9c7767e5e6a2e487bc3.tar.bz2 | |
Merge branch 'cuda-device-link-ccbin' into release-3.9
Merge-request: !1138
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCUDAInformation.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake index 9bba847..f4609cd 100644 --- a/Modules/CMakeCUDAInformation.cmake +++ b/Modules/CMakeCUDAInformation.cmake @@ -198,11 +198,11 @@ endif() #These are used when linking relocatable (dc) cuda code if(NOT CMAKE_CUDA_DEVICE_LINK_LIBRARY) set(CMAKE_CUDA_DEVICE_LINK_LIBRARY - "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") endif() if(NOT CMAKE_CUDA_DEVICE_LINK_EXECUTABLE) set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE - "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") endif() unset(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS) |