From: Matthias Maier Date: Fri, 15 Jul 2016 09:42:23 +0000 (-0500) Subject: CMake: Mark a number of variables as advanced, fix clear variables for trilinos X-Git-Tag: v8.5.0-rc1~863^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bf98ddfb494101982ca6cadcdc86274c228d7fa;p=dealii.git CMake: Mark a number of variables as advanced, fix clear variables for trilinos --- diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_1_cuda.cmake index 1e1fb97b01..8dde6aa95d 100644 --- a/cmake/configure/configure_1_cuda.cmake +++ b/cmake/configure/configure_1_cuda.cmake @@ -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) diff --git a/cmake/modules/FindTRILINOS.cmake b/cmake/modules/FindTRILINOS.cmake index 0e101120ce..eea17921ab 100644 --- a/cmake/modules/FindTRILINOS.cmake +++ b/cmake/modules/FindTRILINOS.cmake @@ -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 )