]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
intermediate
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 8 Aug 2012 19:31:06 +0000 (19:31 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 8 Aug 2012 19:31:06 +0000 (19:31 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25785 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/source/CMakeLists.txt
deal.II/source/base/CMakeLists.txt
deal.II/source/distributed/CMakeLists.txt

index 99388eaa344cc9827005eb919a6ba3427b0f294e..6a44cc0c514535ab79051d9b2fc59589dae75db6 100644 (file)
@@ -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)
index 6c0887504a7595a188ea55d9b66dfb8b9727da00..9c09f65d0abbc4cfb6eeb00a12037947ea8f166e 100644 (file)
@@ -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
-  $<TARGET_OBJECTS:OBJ_BASE>
-  $<TARGET_OBJECTS:OBJ_DISTRIBUTED>
-  $<TARGET_OBJECTS:OBJ_DOFS>
-  $<TARGET_OBJECTS:OBJ_FE>
-  $<TARGET_OBJECTS:OBJ_GRID>
-  $<TARGET_OBJECTS:OBJ_HP>
-  $<TARGET_OBJECTS:OBJ_LAC>
-  $<TARGET_OBJECTS:OBJ_MULTIGRID>
-  $<TARGET_OBJECTS:OBJ_NUMERICS>
+  $<TARGET_OBJECTS:obj_base>
+  $<TARGET_OBJECTS:obj_distributed>
+
+  #$<TARGET_OBJECTS:obj_dofs>
+  #$<TARGET_OBJECTS:obj_fe>
+  #$<TARGET_OBJECTS:obj_grid>
+  #$<TARGET_OBJECTS:obj_hp>
+  #$<TARGET_OBJECTS:obj_lac>
+  #$<TARGET_OBJECTS:obj_multigrid>
+  #$<TARGET_OBJECTS:obj_numerics>
   )
index 2c2ff37454ed051625bc993a2174f7e0ef0136ff..6378dc8dab8de63dbbd02f657f3c017870fa3119 100644 (file)
@@ -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})
index 103308b2d80b96ec899200360e99b84352d8eb42..193ee448bf550d0f97aad55b9cd0faee5ffcdf38 100644 (file)
@@ -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})
+

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.