]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Mark a number of variables as advanced, fix clear variables for trilinos 2833/head
authorMatthias Maier <tamiko@43-1.org>
Fri, 15 Jul 2016 09:42:23 +0000 (04:42 -0500)
committerMatthias Maier <tamiko@43-1.org>
Fri, 15 Jul 2016 09:42:23 +0000 (04:42 -0500)
cmake/configure/configure_1_cuda.cmake
cmake/modules/FindTRILINOS.cmake

index 1e1fb97b01b26b18ad6280cbc3ff764854d93c24..8dde6aa95db39cbbd54187f5832a06a53e102127 100644 (file)
@@ -25,7 +25,17 @@ SET(FEATURE_CUDA_DEPENDS CXX11)
 
 MACRO(FEATURE_CUDA_FIND_EXTERNAL var)
 
+  #
+  # FIXME Restructure this call into a ./modules/FindCUDA.cmake file and
+  # use DEAL_II_PACKAGE_HANDLE
+  #
   FIND_PACKAGE(CUDA)
+  MARK_AS_ADVANCED(
+    CUDA_HOST_COMPILER
+    CUDA_SDK_ROOT_DIR
+    CUDA_TOOLKIT_ROOT_DIR
+    CUDA_USE_STATIC_CUDA_RUNTIME
+    )
 
   IF(CUDA_FOUND)
 
index 0e101120ce342981afcf59872e07bb9cd2ea0444..eea17921ab6683d9c3017c7e5965c1034e44490a 100644 (file)
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2012 - 2015 by the deal.II authors
+## Copyright (C) 2012 - 2016 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -232,5 +232,5 @@ DEAL_II_PACKAGE_HANDLE(TRILINOS
     OPTIONAL Trilinos_TPL_INCLUDE_DIRS
   CLEAR
     TRILINOS_CONFIG_DIR EPETRA_CONFIG_H SACADO_CMATH_HPP ${_libraries}
-    TRILINOS_SUPPORTS_CPP11 TRILINOS_HAS_C99_TR1_WORKAROUND
+    TRILINOS_SUPPORTS_CPP11 TRILINOS_HAS_C99_TR1_WORKAROUND SACADO_CONFIG_H
   )

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.