From 9ee78a202ca9caf1ce842d70749876c31f27618d Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 10 Apr 2013 14:02:17 +0000 Subject: [PATCH] Do the same for algorithms as well git-svn-id: https://svn.dealii.org/trunk@29246 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/algorithms/CMakeLists.txt | 9 ++++++++- deal.II/source/{lac => algorithms}/operator.cc | 0 deal.II/source/{lac => algorithms}/operator.inst.in | 0 deal.II/source/{lac => algorithms}/timestep_control.cc | 0 deal.II/source/lac/CMakeLists.txt | 3 --- 5 files changed, 8 insertions(+), 4 deletions(-) rename deal.II/source/{lac => algorithms}/operator.cc (100%) rename deal.II/source/{lac => algorithms}/operator.inst.in (100%) rename deal.II/source/{lac => algorithms}/timestep_control.cc (100%) diff --git a/deal.II/source/algorithms/CMakeLists.txt b/deal.II/source/algorithms/CMakeLists.txt index 15a95c83b2..3a382d7c8f 100644 --- a/deal.II/source/algorithms/CMakeLists.txt +++ b/deal.II/source/algorithms/CMakeLists.txt @@ -19,6 +19,13 @@ FILE(GLOB _header ) SET(_src + operator.cc + timestep_control.cc ) -DEAL_II_ADD_LIBRARY(obj_algorithms OBJECT ${_src} ${_header}) +SET(_inst + operator.inst.in + ) + +DEAL_II_ADD_LIBRARY(obj_algorithms OBJECT ${_src} ${_header} ${_inst}) +EXPAND_INSTANTIATIONS(obj_algorithms "${_inst}") diff --git a/deal.II/source/lac/operator.cc b/deal.II/source/algorithms/operator.cc similarity index 100% rename from deal.II/source/lac/operator.cc rename to deal.II/source/algorithms/operator.cc diff --git a/deal.II/source/lac/operator.inst.in b/deal.II/source/algorithms/operator.inst.in similarity index 100% rename from deal.II/source/lac/operator.inst.in rename to deal.II/source/algorithms/operator.inst.in diff --git a/deal.II/source/lac/timestep_control.cc b/deal.II/source/algorithms/timestep_control.cc similarity index 100% rename from deal.II/source/lac/timestep_control.cc rename to deal.II/source/algorithms/timestep_control.cc diff --git a/deal.II/source/lac/CMakeLists.txt b/deal.II/source/lac/CMakeLists.txt index 14f27af4f7..e4a11e76c9 100644 --- a/deal.II/source/lac/CMakeLists.txt +++ b/deal.II/source/lac/CMakeLists.txt @@ -34,7 +34,6 @@ SET(_src lapack_full_matrix.cc matrix_lib.cc matrix_out.cc - operator.cc parallel_vector.cc petsc_block_sparse_matrix.cc petsc_full_matrix.cc @@ -66,7 +65,6 @@ SET(_src sparsity_pattern.cc sparsity_tools.cc swappable_vector.cc - timestep_control.cc tridiagonal_matrix.cc trilinos_block_sparse_matrix.cc trilinos_block_vector.cc @@ -88,7 +86,6 @@ SET(_inst constraint_matrix.inst.in full_matrix.inst.in lapack_full_matrix.inst.in - operator.inst.in parallel_vector.inst.in precondition_block.inst.in relaxation_block.inst.in -- 2.39.5