]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Don't use __attribute__((deprecated)) with CUDA 6789/head
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Mon, 18 Jun 2018 20:54:47 +0000 (22:54 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Mon, 18 Jun 2018 20:54:47 +0000 (22:54 +0200)
cmake/checks/check_02_compiler_features.cmake

index a2b90d1c4c871ab9b4c505abcf443ade0fa1ccbd..56d7e51690156f940df2546de2fa978221221a19 100644 (file)
@@ -338,7 +338,7 @@ RESET_CMAKE_REQUIRED()
 
 IF(DEAL_II_COMPILER_HAS_CXX14_ATTRIBUTE_DEPRECATED)
   SET(DEAL_II_DEPRECATED "[[deprecated]]")
-ELSEIF(DEAL_II_COMPILER_HAS_ATTRIBUTE_DEPRECATED)
+ELSEIF(DEAL_II_COMPILER_HAS_ATTRIBUTE_DEPRECATED AND NOT DEAL_II_WITH_CUDA)
   SET(DEAL_II_DEPRECATED "__attribute__((deprecated))")
 ELSE()
   SET(DEAL_II_DEPRECATED " ")

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.