From ca393d5ddd463c7d716176f5b7c44ca3d70abd2b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 20 Feb 2019 18:20:23 +0100 Subject: [PATCH] Detect Tpetra support correctly if Trilinos is compiled with CUDA support --- cmake/configure/configure_2_trilinos.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index 9b3c861395..187fed9071 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -163,7 +163,15 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) # Check if Tpetra is usable in fact. # LIST(APPEND CMAKE_REQUIRED_INCLUDES ${Trilinos_INCLUDE_DIRS}) + LIST(APPEND CMAKE_REQUIRED_INCLUDES ${MPI_CXX_INCLUDE_PATH}) ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}") + CHECK_SYMBOL_EXISTS( + "KOKKOS_ENABLE_CUDA_LAMBDA" + "Kokkos_Macros.hpp" + DEAL_II_KOKKOS_LAMBDA_EXISTS) + IF(${DEAL_II_KOKKOS_LAMBDA_EXISTS}) + ADD_FLAGS(CMAKE_REQUIRED_FLAGS "--expt-extended-lambda") + ENDIF() LIST(APPEND CMAKE_REQUIRED_LIBRARIES "${Trilinos_LIBRARIES}") CHECK_CXX_SOURCE_COMPILES( " -- 2.39.5