]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Reorganize the build process of expand_instantiations and the rest in the common...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Sep 2012 08:24:59 +0000 (08:24 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Sep 2012 08:24:59 +0000 (08:24 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26298 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/common/CMakeLists.txt [new file with mode: 0644]
deal.II/common/expand_instantiations/CMakeLists.txt [deleted file]
deal.II/common/expand_instantiations/template-arguments.in [deleted file]
deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake

index 32d210bc8bc945f9b7ac44ad37ca12acd65a5541..5cdf847c65937708859a672ceb40a6fc1f264dc6 100644 (file)
@@ -175,7 +175,7 @@ INCLUDE(check_for_compiler_bugs)
 # Build the toolchain:
 #
 
-ADD_SUBDIRECTORY(common/expand_instantiations)
+ADD_SUBDIRECTORY(common)
 
 
 
diff --git a/deal.II/common/CMakeLists.txt b/deal.II/common/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6ab4cdf
--- /dev/null
@@ -0,0 +1,11 @@
+ADD_EXECUTABLE(expand_instantiations expand_instantiations/expand_instantiations.cc)
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/template-arguments.in
+  ${CMAKE_CURRENT_BINARY_DIR}/template-arguments
+  )
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in
+  ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options
+  )
diff --git a/deal.II/common/expand_instantiations/CMakeLists.txt b/deal.II/common/expand_instantiations/CMakeLists.txt
deleted file mode 100644 (file)
index fdd4c91..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-ADD_EXECUTABLE(expand_instantiations expand_instantiations.cc)
-
-CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/template-arguments.in
-  ${CMAKE_CURRENT_BINARY_DIR}/template-arguments
-  )
diff --git a/deal.II/common/expand_instantiations/template-arguments.in b/deal.II/common/expand_instantiations/template-arguments.in
deleted file mode 100644 (file)
index 09d4d33..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-REAL_SCALARS    := { double; float; long double }
-COMPLEX_SCALARS := { std::complex<double>;
-                     std::complex<float>;
-                     std::complex<long double> }
-
-DERIVATIVE_TENSORS := { double;
-                       Tensor<1,deal_II_dimension>;
-                       Tensor<2,deal_II_dimension> }
-
-DEAL_II_VEC_TEMPLATES := { Vector; BlockVector }
-
-SERIAL_VECTORS := { Vector<double>;
-                    Vector<float> ;
-                   Vector<long double>;
-
-                   BlockVector<double>;
-                    BlockVector<float>;
-                    BlockVector<long double>;
-
-                   parallel::distributed::Vector<double>;
-                   parallel::distributed::Vector<float> ;
-                   parallel::distributed::Vector<long double>;
-
-                    parallel::distributed::BlockVector<double>;
-                    parallel::distributed::BlockVector<float> ;
-                    parallel::distributed::BlockVector<long double>;
-
-                   @DEAL_II_EXPAND_TRILINOS_VECTOR@;
-                   @DEAL_II_EXPAND_TRILINOS_MPI_VECTOR@;
-                   @DEAL_II_EXPAND_PETSC_VECTOR@;
-                   @DEAL_II_EXPAND_PETSC_MPI_VECTOR@;
-
-                   @DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR@;
-                   @DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR@;
-                   @DEAL_II_EXPAND_PETSC_BLOCKVECTOR@;
-                   @DEAL_II_EXPAND_PETSC_MPI_BLOCKVECTOR@;
-                  }
-
-DOFHANDLERS := { DoFHandler<deal_II_dimension>;
-                 hp::DoFHandler<deal_II_dimension>;
-                MGDoFHandler<deal_II_dimension> }
-
-DOFHANDLER_TEMPLATES := { DoFHandler;
-                          hp::DoFHandler;
-                         MGDoFHandler }
-
-TRIANGULATION_AND_DOFHANDLER_TEMPLATES := { Triangulation;
-                                           DoFHandler;
-                                           hp::DoFHandler;
-                                           MGDoFHandler}
-
-TRIANGULATION_AND_DOFHANDLERS := { Triangulation<deal_II_dimension, deal_II_space_dimension>;
-                                   DoFHandler<deal_II_dimension, deal_II_space_dimension>;
-                                   hp::DoFHandler<deal_II_dimension, deal_II_space_dimension>;
-                                  MGDoFHandler<deal_II_dimension, deal_II_space_dimension> }
-
-
-FEVALUES_BASES := { FEValuesBase<deal_II_dimension>;
-                   FEFaceValuesBase<deal_II_dimension> }
-
-SPARSITY_PATTERNS := { SparsityPattern;
-                       CompressedSparsityPattern;
-                       CompressedSetSparsityPattern;
-                       CompressedSimpleSparsityPattern;
-                       @DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN@;
-
-                       BlockSparsityPattern;
-                       BlockCompressedSparsityPattern;
-                       BlockCompressedSetSparsityPattern;
-                       BlockCompressedSimpleSparsityPattern;
-                       @DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN@; }
-
-DIMENSIONS := { 1; 2; 3 }
-
-SPACE_DIMENSIONS := { 1; 2; 3 }
index c2f1fce57a0fd75a859bb4c60ba41bf8d89f1d17..dcd448ac8310d00dd2a8560880b392aa04550259 100644 (file)
@@ -8,7 +8,7 @@ MACRO(macro_expand_instantiations target inst_in_files)
       DEPENDS expand_instantiations
               ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file}
       COMMAND expand_instantiations
-      ARGS ${CMAKE_BINARY_DIR}/common/expand_instantiations/template-arguments
+      ARGS ${CMAKE_BINARY_DIR}/common/template-arguments
            < ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file}
            > ${CMAKE_CURRENT_BINARY_DIR}/${inst_file}
       )

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.