]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CUDA: fix cmake 3.10 and remove warning 6012/head
authorTimo Heister <timo.heister@gmail.com>
Thu, 8 Mar 2018 17:11:14 +0000 (12:11 -0500)
committerTimo Heister <timo.heister@gmail.com>
Thu, 8 Mar 2018 17:11:14 +0000 (12:11 -0500)
cmake/configure/configure_1_cuda.cmake
source/lac/cuda_sparse_matrix.cu

index d49ba45ce531bea51f55577d754093aa7b37b3a5..7b9f2e19062e50f09a4ed33a3724626660b6de03 100644 (file)
@@ -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:
   #
index 5008d6f4ecee14dfbefc4374b1c1cdff04260e81..467d5a51f245998778edddfb4dd8c57d6eb02bd3 100644 (file)
@@ -26,8 +26,6 @@ DEAL_II_NAMESPACE_OPEN
 
 namespace CUDAWrappers
 {
-  using ::dealii::CUDAWrappers::block_size;
-
   namespace internal
   {
     template <typename Number>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.