From: maier Date: Wed, 12 Sep 2012 08:24:59 +0000 (+0000) Subject: Reorganize the build process of expand_instantiations and the rest in the common... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc9923f9a1c2b5fa094548184ebbef378c615a25;p=dealii-svn.git Reorganize the build process of expand_instantiations and the rest in the common folder git-svn-id: https://svn.dealii.org/branches/branch_cmake@26298 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 32d210bc8b..5cdf847c65 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -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 index 0000000000..6ab4cdfb46 --- /dev/null +++ b/deal.II/common/CMakeLists.txt @@ -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 index fdd4c91411..0000000000 --- a/deal.II/common/expand_instantiations/CMakeLists.txt +++ /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 index 09d4d3354d..0000000000 --- a/deal.II/common/expand_instantiations/template-arguments.in +++ /dev/null @@ -1,75 +0,0 @@ -REAL_SCALARS := { double; float; long double } -COMPLEX_SCALARS := { std::complex; - std::complex; - std::complex } - -DERIVATIVE_TENSORS := { double; - Tensor<1,deal_II_dimension>; - Tensor<2,deal_II_dimension> } - -DEAL_II_VEC_TEMPLATES := { Vector; BlockVector } - -SERIAL_VECTORS := { Vector; - Vector ; - Vector; - - BlockVector; - BlockVector; - BlockVector; - - parallel::distributed::Vector; - parallel::distributed::Vector ; - parallel::distributed::Vector; - - parallel::distributed::BlockVector; - parallel::distributed::BlockVector ; - parallel::distributed::BlockVector; - - @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; - hp::DoFHandler; - MGDoFHandler } - -DOFHANDLER_TEMPLATES := { DoFHandler; - hp::DoFHandler; - MGDoFHandler } - -TRIANGULATION_AND_DOFHANDLER_TEMPLATES := { Triangulation; - DoFHandler; - hp::DoFHandler; - MGDoFHandler} - -TRIANGULATION_AND_DOFHANDLERS := { Triangulation; - DoFHandler; - hp::DoFHandler; - MGDoFHandler } - - -FEVALUES_BASES := { FEValuesBase; - FEFaceValuesBase } - -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 } diff --git a/deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake b/deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake index c2f1fce57a..dcd448ac83 100644 --- a/deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake +++ b/deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake @@ -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} )