diff options
| author | Raul Tambre <raul@tambre.ee> | 2021-02-14 09:49:28 (GMT) |
|---|---|---|
| committer | Raul Tambre <raul@tambre.ee> | 2021-02-14 09:53:26 (GMT) |
| commit | af38d5a1d43819d12b364308520cf9435fcc8ef2 (patch) | |
| tree | 9b9854841b13fe7f652e29e3f3a94b91929570bf | |
| parent | 4dc1c9e5251ec8c63bf19d074431a7662c742b55 (diff) | |
| download | CMake-af38d5a1d43819d12b364308520cf9435fcc8ef2.zip CMake-af38d5a1d43819d12b364308520cf9435fcc8ef2.tar.gz CMake-af38d5a1d43819d12b364308520cf9435fcc8ef2.tar.bz2 | |
Platform/Windows-NVIDIA-CUDA: Remove duplicated code
Some of the things are set in Platform/NVIDIA-CUDA and since we aren't setting
them to different values there's no point in overriding them.
Also fixed an unset() copy-paste error.
| -rw-r--r-- | Modules/Platform/Windows-NVIDIA-CUDA.cmake | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake index 32cf7b8..b83932e 100644 --- a/Modules/Platform/Windows-NVIDIA-CUDA.cmake +++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake @@ -27,7 +27,7 @@ set(CMAKE_CUDA_CREATE_STATIC_LIBRARY "<CMAKE_AR> ${CMAKE_CL_NOLOGO} <LINK_FLAGS set(CMAKE_CUDA_LINKER_SUPPORTS_PDB ON) set(CMAKE_CUDA_LINK_EXECUTABLE "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${__IMPLICIT_LINKS} ${CMAKE_END_TEMP_FILE}") -unset(_CMAKE_VS_LINK_EXE) +unset(_CMAKE_VS_LINK_DLL) unset(_CMAKE_VS_LINK_EXE) @@ -69,14 +69,6 @@ else() endif() unset(_cmp0092) -set(CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_STATIC "cudadevrt;cudart_static") -set(CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_SHARED "cudadevrt;cudart") -set(CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_NONE "") - -if(UNIX) - list(APPEND CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_STATIC "rt" "pthread" "dl") -endif() - string(APPEND CMAKE_CUDA_FLAGS_INIT " ${PLATFORM_DEFINES_CUDA} -D_WINDOWS -Xcompiler=\"${_W3}${_FLAGS_CXX}\"") string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=\"${_MDd}-Zi -Ob0 -Od ${_RTC1}\"") string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -Xcompiler=\"${_MD}-O2 -Ob2\" -DNDEBUG") |