From 17a6c14a9a1965c9c71d505c82078c3b15d6d01c Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 7 Aug 2012 16:33:54 +0000 Subject: [PATCH] Etwas schoener... git-svn-id: https://svn.dealii.org/branches/branch_cmake@25762 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/CMakeLists.txt | 12 +--- deal.II/source/base/CMakeLists.txt | 96 +++++++++++++++--------------- 2 files changed, 51 insertions(+), 57 deletions(-) diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index 99de2964b7..de0d75c972 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -1,11 +1,3 @@ -INCLUDE(base/CMakeLists.txt) -#INCLUDE(distributed/CMakeLists.txt) -#INCLUDE(dofs/CMakeLists.txt) -#INCLUDE(fe/CMakeLists.txt) -#INCLUDE(grid/CMakeLists.txt) -#INCLUDE(hp/CMakeLists.txt) -#INCLUDE(lac/CMakeLists.txt) -#INCLUDE(multigrid/CMakeLists.txt) -#INCLUDE(numerics/CMakeLists.txt) +ADD_SUBDIRECTORY(base) -ADD_LIBRARY(deal.II ${SRC_BASE}) +ADD_LIBRARY(deal.II $) diff --git a/deal.II/source/base/CMakeLists.txt b/deal.II/source/base/CMakeLists.txt index 928c8431ec..2c2ff37454 100644 --- a/deal.II/source/base/CMakeLists.txt +++ b/deal.II/source/base/CMakeLists.txt @@ -1,49 +1,51 @@ set(SRC_BASE - ${CMAKE_CURRENT_SOURCE_DIR}/base/auto_derivative_function.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/boost_serialization.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/boost_threads.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/conditional_ostream.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/config.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/convergence_table.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/data_out_base.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/event.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/exceptions.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/flow_function.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/function.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/function_derivative.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/function_lib.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/function_lib_cutoff.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/function_parser.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/function_time.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/geometry_info.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/index_set.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/job_identifier.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/logstream.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/memory_consumption.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/mpi.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/multithread_info.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/parallel.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/parameter_handler.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/parsed_function.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/partitioner.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/path_search.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomial.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomials_abf.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomials_adini.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomials_bdm.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomials_nedelec.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomial_space.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomials_p.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/polynomials_raviart_thomas.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/quadrature.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/quadrature_lib.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/quadrature_selector.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/subscriptor.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/symmetric_tensor.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/table_handler.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/tensor_function.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/tensor_product_polynomials.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/thread_management.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/timer.cc - ${CMAKE_CURRENT_SOURCE_DIR}/base/utilities.cc + auto_derivative_function.cc + boost_serialization.cc + boost_threads.cc + conditional_ostream.cc + config.cc + convergence_table.cc + data_out_base.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 + 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 + thread_management.cc + timer.cc + utilities.cc ) + +add_library(OBJ_BASE OBJECT ${SRC_BASE}) -- 2.39.5