From: maier Date: Wed, 8 Aug 2012 19:31:06 +0000 (+0000) Subject: intermediate X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41e1e1845756b68d9a32fb2bbae939def9677a35;p=dealii-svn.git intermediate git-svn-id: https://svn.dealii.org/branches/branch_cmake@25785 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 99388eaa34..6a44cc0c51 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -1,14 +1,17 @@ PROJECT (deal.II) set (VERSION "8.0.pre") -CMAKE_MINIMUM_REQUIRED (VERSION 2.8) +CMAKE_MINIMUM_REQUIRED (VERSION 2.8.8) SET (CMAKE_CXX_FLAGS "-std=c++0x -D_REENTRANT -fPIC -O2 -march=native -Wall -Wfatal-errors -pedantic") +SET (CMAKE_INCLUDE_CURRENT_DIR "true") + INCLUDE_DIRECTORIES( "${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/include" #TODO "${CMAKE_SOURCE_DIR}/contrib" #TODO "${CMAKE_SOURCE_DIR}/include/" ) -# ADD_SUBDIRECTORY(contrib) +ADD_SUBDIRECTORY(common/expand_instantiations) + ADD_SUBDIRECTORY(source) diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index 6c0887504a..9c09f65d0a 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -1,21 +1,22 @@ ADD_SUBDIRECTORY(base) ADD_SUBDIRECTORY(distributed) -ADD_SUBDIRECTORY(dofs) -ADD_SUBDIRECTORY(fe) -ADD_SUBDIRECTORY(grid) -ADD_SUBDIRECTORY(hp) -ADD_SUBDIRECTORY(lac) -ADD_SUBDIRECTORY(multigrid) -ADD_SUBDIRECTORY(numerics) +#ADD_SUBDIRECTORY(dofs) +#ADD_SUBDIRECTORY(fe) +#ADD_SUBDIRECTORY(grid) +#ADD_SUBDIRECTORY(hp) +#ADD_SUBDIRECTORY(lac) +#ADD_SUBDIRECTORY(multigrid) +#ADD_SUBDIRECTORY(numerics) ADD_LIBRARY(deal.II - $ - $ - $ - $ - $ - $ - $ - $ - $ + $ + $ + + #$ + #$ + #$ + #$ + #$ + #$ + #$ ) diff --git a/deal.II/source/base/CMakeLists.txt b/deal.II/source/base/CMakeLists.txt index 2c2ff37454..6378dc8dab 100644 --- a/deal.II/source/base/CMakeLists.txt +++ b/deal.II/source/base/CMakeLists.txt @@ -1,4 +1,4 @@ -set(SRC_BASE +SET(src_base auto_derivative_function.cc boost_serialization.cc boost_threads.cc @@ -48,4 +48,4 @@ set(SRC_BASE utilities.cc ) -add_library(OBJ_BASE OBJECT ${SRC_BASE}) +ADD_LIBRARY(obj_base OBJECT ${src_base}) diff --git a/deal.II/source/distributed/CMakeLists.txt b/deal.II/source/distributed/CMakeLists.txt index 103308b2d8..193ee448bf 100644 --- a/deal.II/source/distributed/CMakeLists.txt +++ b/deal.II/source/distributed/CMakeLists.txt @@ -1,7 +1,34 @@ -set(SRC_DISTRIBUTED +SET(src_distributed grid_refinement.cc solution_transfer.cc tria.cc ) -add_library(OBJ_DISTRIBUTED OBJECT ${SRC_DISTRIBUTED}) +SET(inst_in_files + grid_refinement.inst.in + solution_transfer.inst.in + tria.inst.in + ) + +GET_TARGET_PROPERTY ( + expand_instantiations_exe + expand_instantiations + LOCATION + ) + +FOREACH (inst_in_file ${inst_in_files}) + STRING(REGEX REPLACE "\\.in$" "" inst_file "${inst_in_file}" ) + ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${inst_file} + DEPENDS + expand_instantiations + COMMAND ${expand_instantiations_exe} + ARGS + ~/template-arguments + < ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file} + > ${CMAKE_CURRENT_BINARY_DIR}/${inst_file} + ) +ENDFOREACH() + +ADD_LIBRARY(obj_distributed OBJECT ${src_distributed}) +