diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-14 15:47:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-14 15:47:01 (GMT) |
| commit | 81ebf4be3eeabe7f1fc42929b3cc46e515fd4800 (patch) | |
| tree | 81813e17e4962997095f058263acdcf0457eecf0 /Modules | |
| parent | f45e3b950991f5c4f66cd132bda61a369a3016d7 (diff) | |
| parent | 1c60231ca546597ef8b80e7340c8991b06387cbf (diff) | |
| download | CMake-81ebf4be3eeabe7f1fc42929b3cc46e515fd4800.zip CMake-81ebf4be3eeabe7f1fc42929b3cc46e515fd4800.tar.gz CMake-81ebf4be3eeabe7f1fc42929b3cc46e515fd4800.tar.bz2 | |
Merge branch 'cuda-with-c' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCUDAInformation.cmake | 6 | ||||
| -rw-r--r-- | Modules/Platform/Windows-NVIDIA-CUDA.cmake | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake index 13b1789..1c48159 100644 --- a/Modules/CMakeCUDAInformation.cmake +++ b/Modules/CMakeCUDAInformation.cmake @@ -93,6 +93,12 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS) endif() +if(CMAKE_CUDA_STANDARD_LIBRARIES_INIT) + set(CMAKE_CUDA_STANDARD_LIBRARIES "${CMAKE_CUDA_STANDARD_LIBRARIES_INIT}" + CACHE STRING "Libraries linked by default with all CUDA applications.") + mark_as_advanced(CMAKE_CUDA_STANDARD_LIBRARIES) +endif() + include(CMakeCommonLanguageInclude) # now define the following rules: diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake index 809ee06..eda41e0 100644 --- a/Modules/Platform/Windows-NVIDIA-CUDA.cmake +++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake @@ -40,3 +40,5 @@ string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=-MDd,-Zi,-RTC1") string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -Xcompiler=-MD") string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -Xcompiler=-MD") string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Xcompiler=-MD") + +set(CMAKE_CUDA_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") |