From 677637df51e497ad8374b6ababa41a1c139b0786 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 6 Sep 2013 03:10:06 +0000 Subject: [PATCH] Cherry-pick from trunk: CMake: Replace explicit file list with globbing expression Conflicts: deal.II/source/hp/CMakeLists.txt git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30623 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/algorithms/CMakeLists.txt | 11 ++- deal.II/source/base/CMakeLists.txt | 53 +------------- deal.II/source/distributed/CMakeLists.txt | 15 ++-- deal.II/source/dofs/CMakeLists.txt | 33 ++------- deal.II/source/fe/CMakeLists.txt | 79 ++------------------ deal.II/source/grid/CMakeLists.txt | 35 ++------- deal.II/source/hp/CMakeLists.txt | 20 ++---- deal.II/source/integrators/CMakeLists.txt | 8 ++- deal.II/source/lac/CMakeLists.txt | 88 ++--------------------- deal.II/source/matrix_free/CMakeLists.txt | 10 ++- deal.II/source/meshworker/CMakeLists.txt | 13 ++-- deal.II/source/multigrid/CMakeLists.txt | 22 ++---- deal.II/source/numerics/CMakeLists.txt | 59 ++------------- 13 files changed, 54 insertions(+), 392 deletions(-) diff --git a/deal.II/source/algorithms/CMakeLists.txt b/deal.II/source/algorithms/CMakeLists.txt index c77a4e71cf..a90cb948a8 100644 --- a/deal.II/source/algorithms/CMakeLists.txt +++ b/deal.II/source/algorithms/CMakeLists.txt @@ -19,14 +19,11 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/algorithms/*.h ) - -SET(_src - operator.cc - timestep_control.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - operator.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_algorithms OBJECT ${_src} ${_header} ${_inst}) diff --git a/deal.II/source/base/CMakeLists.txt b/deal.II/source/base/CMakeLists.txt index d60e54902c..4df19e2b20 100644 --- a/deal.II/source/base/CMakeLists.txt +++ b/deal.II/source/base/CMakeLists.txt @@ -19,59 +19,10 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/base/*.h ) - -SET(_src - auto_derivative_function.cc - conditional_ostream.cc - config.cc - convergence_table.cc - data_out_base.cc - # do NOT include dummy.cc - event.cc - exceptions.cc - flow_function.cc - function.cc - function_derivative.cc - function_lib.cc - function_lib_cutoff.cc - function_parser.cc - function_time.cc - geometry_info.cc - index_set.cc - job_identifier.cc - logstream.cc - memory_consumption.cc - mpi.cc - multithread_info.cc - parallel.cc - parameter_handler.cc - parsed_function.cc - partitioner.cc - path_search.cc - polynomial.cc - polynomials_abf.cc - polynomials_adini.cc - polynomials_bdm.cc - polynomials_nedelec.cc - polynomials_piecewise.cc - polynomial_space.cc - polynomials_p.cc - polynomials_raviart_thomas.cc - quadrature.cc - quadrature_lib.cc - quadrature_selector.cc - subscriptor.cc - symmetric_tensor.cc - table_handler.cc - tensor_function.cc - tensor_product_polynomials.cc - tensor_product_polynomials_const.cc - thread_management.cc - timer.cc - utilities.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) DEAL_II_ADD_LIBRARY(obj_base OBJECT ${_src} ${_header} ${CMAKE_BINARY_DIR}/include/deal.II/base/config.h ) - diff --git a/deal.II/source/distributed/CMakeLists.txt b/deal.II/source/distributed/CMakeLists.txt index 9648b6ae59..ae40826619 100644 --- a/deal.II/source/distributed/CMakeLists.txt +++ b/deal.II/source/distributed/CMakeLists.txt @@ -19,19 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/distributed/*.h ) - -SET(_src - grid_refinement.cc - solution_transfer.cc - tria.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - grid_refinement.inst.in - solution_transfer.inst.in - tria.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_distributed OBJECT ${_src} ${_header} ${_inst}) EXPAND_INSTANTIATIONS(obj_distributed "${_inst}") - diff --git a/deal.II/source/dofs/CMakeLists.txt b/deal.II/source/dofs/CMakeLists.txt index e3bf9d5631..b9dd6e73fa 100644 --- a/deal.II/source/dofs/CMakeLists.txt +++ b/deal.II/source/dofs/CMakeLists.txt @@ -19,37 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/dofs/*.h ) - -SET(_src - block_info.cc - dof_accessor.cc - dof_accessor_get.cc - dof_accessor_set.cc - dof_faces.cc - dof_handler.cc - dof_handler_policy.cc - dof_objects.cc - dof_renumbering.cc - dof_tools.cc - dof_tools_constraints.cc - dof_tools_sparsity.cc - number_cache.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - block_info.inst.in - dof_accessor.inst.in - dof_accessor_get.inst.in - dof_accessor_set.inst.in - dof_handler.inst.in - dof_handler_policy.inst.in - dof_objects.inst.in - dof_renumbering.inst.in - dof_tools.inst.in - dof_tools_constraints.inst.in - dof_tools_sparsity.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_dofs OBJECT ${_src} ${_header} ${_inst}) EXPAND_INSTANTIATIONS(obj_dofs "${_inst}") - diff --git a/deal.II/source/fe/CMakeLists.txt b/deal.II/source/fe/CMakeLists.txt index 5fa933789b..6bdc6a20f7 100644 --- a/deal.II/source/fe/CMakeLists.txt +++ b/deal.II/source/fe/CMakeLists.txt @@ -19,83 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/fe/*.h ) - -SET(_src - block_mask.cc - component_mask.cc - fe_abf.cc - fe_bdm.cc - fe.cc - fe_data.cc - fe_dgp.cc - fe_dgp_monomial.cc - fe_dgp_nonparametric.cc - fe_dgq.cc - fe_dg_vector.cc - fe_face.cc - fe_nedelec.cc - fe_nothing.cc - fe_poly.cc - fe_poly_tensor.cc - fe_q.cc - fe_q_base.cc - fe_q_dg0.cc - fe_q_hierarchical.cc - fe_q_iso_q1.cc - fe_raviart_thomas.cc - fe_raviart_thomas_nodal.cc - fe_system.cc - fe_tools.cc - fe_tools_interpolate.cc - fe_values.cc - fe_values_inst2.cc - mapping_c1.cc - mapping_cartesian.cc - mapping.cc - mapping_q1.cc - mapping_q1_eulerian.cc - mapping_q.cc - mapping_q_eulerian.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - fe_abf.inst.in - fe_bdm.inst.in - fe_dgp.inst.in - fe_dgp_monomial.inst.in - fe_dgp_nonparametric.inst.in - fe_dgq.inst.in - fe_dg_vector.inst.in - fe_face.inst.in - fe.inst.in - fe_nedelec.inst.in - fe_nothing.inst.in - fe_poly.inst.in - fe_poly_tensor.inst.in - fe_q_base.inst.in - fe_q_dg0.inst.in - fe_q_hierarchical.inst.in - fe_q.inst.in - fe_q_iso_q1.inst.in - fe_raviart_thomas.inst.in - fe_raviart_thomas_nodal.inst.in - fe_system.inst.in - fe_tools.inst.in - fe_tools_interpolate.inst.in - fe_values.decl.1.inst.in - fe_values.decl.2.inst.in - fe_values.impl.1.inst.in - fe_values.impl.2.inst.in - fe_values.inst.in - mapping_c1.inst.in - mapping_cartesian.inst.in - mapping.inst.in - mapping_q1_eulerian.inst.in - mapping_q1.inst.in - mapping_q_eulerian.inst.in - mapping_q.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_fe OBJECT ${_src} ${_header} ${_inst}) EXPAND_INSTANTIATIONS(obj_fe "${_inst}") - diff --git a/deal.II/source/grid/CMakeLists.txt b/deal.II/source/grid/CMakeLists.txt index 5e13fa938c..d22df834b5 100644 --- a/deal.II/source/grid/CMakeLists.txt +++ b/deal.II/source/grid/CMakeLists.txt @@ -19,39 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/grid/*.h ) - -SET(_src - grid_generator.cc - grid_in.cc - grid_out.cc - grid_refinement.cc - grid_reordering.cc - grid_tools.cc - intergrid_map.cc - persistent_tria.cc - tria_accessor.cc - tria_boundary.cc - tria_boundary_lib.cc - tria.cc - tria_faces.cc - tria_levels.cc - tria_objects.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - grid_generator.inst.in - grid_in.inst.in - grid_out.inst.in - grid_refinement.inst.in - grid_tools.inst.in - intergrid_map.inst.in - tria_accessor.inst.in - tria_boundary.inst.in - tria_boundary_lib.inst.in - tria.inst.in - tria_objects.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_grid OBJECT ${_src} ${_header} ${_inst}) EXPAND_INSTANTIATIONS(obj_grid "${_inst}") - diff --git a/deal.II/source/hp/CMakeLists.txt b/deal.II/source/hp/CMakeLists.txt index 140accecb5..6cb3662cac 100644 --- a/deal.II/source/hp/CMakeLists.txt +++ b/deal.II/source/hp/CMakeLists.txt @@ -19,24 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/hp/*.h ) - -SET(_src - dof_faces.cc - dof_handler.cc - dof_levels.cc - dof_objects.cc - fe_collection.cc - fe_values.cc - mapping_collection.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - dof_handler.inst.in - fe_collection.inst.in - fe_values.inst.in - mapping_collection.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_hp OBJECT ${_src} ${_header} ${_inst}) EXPAND_INSTANTIATIONS(obj_hp "${_inst}") - diff --git a/deal.II/source/integrators/CMakeLists.txt b/deal.II/source/integrators/CMakeLists.txt index 45ba6b7b61..a428c38532 100644 --- a/deal.II/source/integrators/CMakeLists.txt +++ b/deal.II/source/integrators/CMakeLists.txt @@ -19,8 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/integrators/*.h ) - -SET(_src +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) +# FILE(GLOB _inst +# ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in +# ) DEAL_II_ADD_LIBRARY(obj_integrators OBJECT ${_src} ${_header}) +#EXPAND_INSTANTIATIONS(obj_hp "${_inst}") diff --git a/deal.II/source/lac/CMakeLists.txt b/deal.II/source/lac/CMakeLists.txt index bc2e40555c..2338d41e00 100644 --- a/deal.II/source/lac/CMakeLists.txt +++ b/deal.II/source/lac/CMakeLists.txt @@ -19,88 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/lac/*.h ) - -SET(_src - block_matrix_array.cc - block_sparse_matrix.cc - block_sparse_matrix_ez.cc - block_sparsity_pattern.cc - block_vector.cc - chunk_sparse_matrix.cc - chunk_sparsity_pattern.cc - compressed_set_sparsity_pattern.cc - compressed_simple_sparsity_pattern.cc - compressed_sparsity_pattern.cc - constraint_matrix.cc - full_matrix.cc - lapack_full_matrix.cc - matrix_lib.cc - matrix_out.cc - parallel_vector.cc - petsc_block_sparse_matrix.cc - petsc_full_matrix.cc - petsc_matrix_base.cc - petsc_matrix_free.cc - petsc_parallel_block_sparse_matrix.cc - petsc_parallel_block_vector.cc - petsc_parallel_sparse_matrix.cc - petsc_parallel_vector.cc - petsc_precondition.cc - petsc_solver.cc - petsc_sparse_matrix.cc - petsc_vector_base.cc - petsc_vector.cc - precondition_block.cc - precondition_block_ez.cc - relaxation_block.cc - slepc_solver.cc - slepc_spectral_transformation.cc - solver.cc - solver_control.cc - sparse_decomposition.cc - sparse_direct.cc - sparse_ilu.cc - sparse_matrix.cc - sparse_matrix_ez.cc - sparse_mic.cc - sparse_vanka.cc - sparsity_pattern.cc - sparsity_tools.cc - swappable_vector.cc - tridiagonal_matrix.cc - trilinos_block_sparse_matrix.cc - trilinos_block_vector.cc - trilinos_precondition.cc - trilinos_solver.cc - trilinos_sparse_matrix.cc - trilinos_sparsity_pattern.cc - trilinos_vector_base.cc - trilinos_vector.cc - vector.cc - vector_memory.cc - vector_view.cc -) - -SET(_inst - block_sparse_matrix.inst.in - block_vector.inst.in - chunk_sparse_matrix.inst.in - constraint_matrix.inst.in - full_matrix.inst.in - lapack_full_matrix.inst.in - parallel_vector.inst.in - precondition_block.inst.in - relaxation_block.inst.in - solver.inst.in - sparse_matrix_ez.inst.in - sparse_matrix.inst.in - trilinos_sparse_matrix.inst.in - trilinos_vector_base.inst.in - vector.inst.in - vector_memory.inst.in - vector_view.inst.in -) +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc + ) +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in + ) DEAL_II_ADD_LIBRARY(obj_lac OBJECT ${_src} ${_header} ${_inst}) EXPAND_INSTANTIATIONS(obj_lac "${_inst}") - diff --git a/deal.II/source/matrix_free/CMakeLists.txt b/deal.II/source/matrix_free/CMakeLists.txt index ee5c8bc58a..0188dfcf55 100644 --- a/deal.II/source/matrix_free/CMakeLists.txt +++ b/deal.II/source/matrix_free/CMakeLists.txt @@ -19,13 +19,11 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/matrix_free/*.h ) - -SET(_src - matrix_free.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - matrix_free.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_matrix_free OBJECT ${_src} ${_header} ${_inst}) diff --git a/deal.II/source/meshworker/CMakeLists.txt b/deal.II/source/meshworker/CMakeLists.txt index f58b0fcf63..d41e2242ab 100644 --- a/deal.II/source/meshworker/CMakeLists.txt +++ b/deal.II/source/meshworker/CMakeLists.txt @@ -19,16 +19,11 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/meshworker/*.h ) - -SET(_src - mesh_worker.cc - mesh_worker_info.cc - mesh_worker_vector_selector.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - mesh_worker_info.inst.in - mesh_worker_vector_selector.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_meshworker OBJECT ${_src} ${_header} ${_inst}) diff --git a/deal.II/source/multigrid/CMakeLists.txt b/deal.II/source/multigrid/CMakeLists.txt index 40c223f30d..68e9970c7d 100644 --- a/deal.II/source/multigrid/CMakeLists.txt +++ b/deal.II/source/multigrid/CMakeLists.txt @@ -19,25 +19,11 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/multigrid/*.h ) - -SET(_src - mg_base.cc - mg_dof_handler.cc - mg_tools.cc - mg_transfer_block.cc - mg_transfer_component.cc - mg_transfer_prebuilt.cc - multigrid.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - mg_base.inst.in - mg_dof_handler.inst.in - mg_tools.inst.in - mg_transfer_block.inst.in - mg_transfer_component.inst.in - mg_transfer_prebuilt.inst.in - multigrid.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_multigrid OBJECT ${_src} ${_header} ${_inst}) diff --git a/deal.II/source/numerics/CMakeLists.txt b/deal.II/source/numerics/CMakeLists.txt index df05c2eb6c..229391117c 100644 --- a/deal.II/source/numerics/CMakeLists.txt +++ b/deal.II/source/numerics/CMakeLists.txt @@ -19,63 +19,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) FILE(GLOB _header ${CMAKE_SOURCE_DIR}/include/deal.II/numerics/*.h ) - -SET(_src - data_out.cc - data_out_dof_data.cc - data_out_faces.cc - data_out_rotation.cc - data_out_stack.cc - data_postprocessor.cc - derivative_approximation.cc - dof_output_operator.cc - error_estimator.cc - error_estimator_1d.cc - fe_field_function.cc - matrix_tools.cc - histogram.cc - point_value_history.cc - solution_transfer.cc - solution_transfer_inst2.cc - solution_transfer_inst3.cc - solution_transfer_inst4.cc - time_dependent.cc - vector_tools_boundary.cc - vector_tools_constraints.cc - vector_tools_integrate_difference.cc - vector_tools_interpolate.cc - vector_tools_mean_value.cc - vector_tools_point_value.cc - vector_tools_project.cc - vector_tools_rhs.cc +FILE(GLOB _src + ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) - -SET(_inst - data_out.inst.in - data_out_dof_data.inst.in - data_out_faces.inst.in - data_out_rotation.inst.in - data_out_stack.inst.in - data_postprocessor.inst.in - derivative_approximation.inst.in - dof_output_operator.inst.in - error_estimator.inst.in - error_estimator_1d.inst.in - fe_field_function.inst.in - matrix_tools.inst.in - point_value_history.inst.in - solution_transfer.inst.in - time_dependent.inst.in - vector_tools_boundary.inst.in - vector_tools_constraints.inst.in - vector_tools_integrate_difference.inst.in - vector_tools_interpolate.inst.in - vector_tools_mean_value.inst.in - vector_tools_point_value.inst.in - vector_tools_project.inst.in - vector_tools_rhs.inst.in +FILE(GLOB _inst + ${CMAKE_CURRENT_SOURCE_DIR}/*.inst.in ) DEAL_II_ADD_LIBRARY(obj_numerics OBJECT ${_src} ${_header} ${_inst}) EXPAND_INSTANTIATIONS(obj_numerics "${_inst}") - -- 2.39.5