From: Timo Heister Date: Thu, 8 Mar 2018 17:11:14 +0000 (-0500) Subject: CUDA: fix cmake 3.10 and remove warning X-Git-Tag: v9.0.0-rc1~350^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6012%2Fhead;p=dealii.git CUDA: fix cmake 3.10 and remove warning --- diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_1_cuda.cmake index d49ba45ce5..7b9f2e1906 100644 --- a/cmake/configure/configure_1_cuda.cmake +++ b/cmake/configure/configure_1_cuda.cmake @@ -110,6 +110,14 @@ MACRO(FEATURE_CUDA_CONFIGURE_EXTERNAL) MARK_AS_ADVANCED(CMAKE_CUDA_HOST_COMPILER) + # + # Work around a cmake 3.10 bug, see https://gitlab.kitware.com/cmake/cmake/issues/17797 + # because make does not support rsp link commands + # + SET(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_INCLUDES 0) + SET(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 0) + SET(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 0) + # # Set up cuda flags: # diff --git a/source/lac/cuda_sparse_matrix.cu b/source/lac/cuda_sparse_matrix.cu index 5008d6f4ec..467d5a51f2 100644 --- a/source/lac/cuda_sparse_matrix.cu +++ b/source/lac/cuda_sparse_matrix.cu @@ -26,8 +26,6 @@ DEAL_II_NAMESPACE_OPEN namespace CUDAWrappers { - using ::dealii::CUDAWrappers::block_size; - namespace internal { template