From 06824a85335f2a733e87804506b2bd77097d7240 Mon Sep 17 00:00:00 2001 From: turcksin Date: Sat, 1 Jun 2013 00:20:15 +0000 Subject: [PATCH] By default uses 32bit indices. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29709 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_petsc.cmake | 4 ++++ deal.II/cmake/configure/configure_trilinos.cmake | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake index a7d8d6d626..c2c3c903fb 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_petsc.cmake @@ -74,6 +74,10 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var) # indices support is enabled. # So we check for this: # + IF("${DEAL_II_WITH_64BIT_INDICES}" STREQUAL "") + SET(DEAL_II_WITH_64BIT_INDICES "OFF") + ENDIF() + IF( (NOT PETSC_WITH_64BIT_INDICES AND DEAL_II_WITH_64BIT_INDICES) OR (PETSC_WITH_64BIT_INDICES AND NOT DEAL_II_WITH_64BIT_INDICES)) diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake index d7e08f752f..b780b0bed5 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_trilinos.cmake @@ -119,6 +119,10 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) # Trilinos has to be configured with 32bit indices if deal.II uses unsigned long # long int. # + IF("${DEAL_II_WITH_64BIT_INDICES}" STREQUAL "") + SET(DEAL_II_WITH_64BIT_INDICES "OFF") + ENDIF() + IF(TRILINOS_WITH_NO_32BIT_INDICES AND NOT DEAL_II_WITH_64BIT_INDICES) MESSAGE(STATUS "deal.II was configured to use 32bit global indices but " "Trilinos was not." -- 2.39.5