Move default initialization to a central location.

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29718 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake
index 43f0486b7a30f6974b3fbfd91e5a7d20484c1e06..a7d8d6d626c578dea52fe25604b7068c89413684 100644 (file)
--- a/deal.II/cmake/configure/configure_petsc.cmake
+++ b/deal.II/cmake/configure/configure_petsc.cmake
@@ -74,8 +74,6 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var)
     # indices support is enabled.
     # So we check for this:
     #
-    SET_IF_EMPTY(DEAL_II_WITH_64BIT_INDICES "OFF")
-
     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 2d898cbc84bd9f724346d1cbcc3758bf562dbfe4..d7e08f752ffebb7605e2229e38b13f32a657c7e0 100644 (file)
--- a/deal.II/cmake/configure/configure_trilinos.cmake
+++ b/deal.II/cmake/configure/configure_trilinos.cmake
@@ -119,8 +119,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     # Trilinos has to be configured with 32bit indices if deal.II uses unsigned long
     # long int.
     #
-    SET_IF_EMPTY(DEAL_II_WITH_64BIT_INDICES "OFF")
-
     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."

diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake
index 4c3831b104262d2b23037e71c03359748c960ed3..7859e1f4a5abf4278f2e44d26791656b45fa96b9 100644 (file)
--- a/deal.II/cmake/setup_cached_variables.cmake
+++ b/deal.II/cmake/setup_cached_variables.cmake
@@ -248,6 +248,9 @@ SET(DEAL_II_WITH_64BIT_INDICES "${DEAL_II_WITH_64BIT_INDICES}" CACHE BOOL
 
 MARK_AS_ADVANCED(DEAL_II_WITH_64BIT_INDICES)
 
+SET_IF_EMPTY(DEAL_II_WITH_64BIT_INDICES "OFF")
+
+
 
 
 #