]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Roundup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 10:14:22 +0000 (10:14 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 10:14:22 +0000 (10:14 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25799 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake [moved from deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake with 96% similarity]
deal.II/source/numerics/CMakeLists.txt

index c55a566c12a5858a4c69f2f203ed51667e612483..792d8dc57934c8e3f3d01eeb9be2b15b9d2dd328 100644 (file)
@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(
 ADD_SUBDIRECTORY(common/expand_instantiations)
 #ADD_SUBDIRECTORY(contrib)
 
-INCLUDE(${CMAKE_SOURCE_DIR}/contrib/cmake/Macros/macro_expand_instantiations.cmake)
+INCLUDE(${CMAKE_SOURCE_DIR}/contrib/cmake/macros/macro_expand_instantiations.cmake)
 
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(source)
similarity index 96%
rename from deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake
rename to deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake
index 3739f311c1f89c14dfd1d52ac6007946f5c2feab..c2f1fce57a0fd75a859bb4c60ba41bf8d89f1d17 100644 (file)
@@ -3,7 +3,7 @@ MACRO(macro_expand_instantiations target inst_in_files)
   FOREACH (inst_in_file ${inst_in_files})
     STRING(REGEX REPLACE "\\.in$" "" inst_file "${inst_in_file}" )
 
-    ADD_CUSTOM_COMMAND (
+    ADD_CUSTOM_COMMAND(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${inst_file}
       DEPENDS expand_instantiations
               ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file}
index 4d270068e0afabdde5911e218cf4c3304b9e600a..3f26a8381508f4da4e85fcfc229a3d6ba8f09051 100644 (file)
@@ -13,7 +13,7 @@ SET(src
   mesh_worker.cc
   mesh_worker_info.cc
   mesh_worker_vector_selector.cc
-  operator.cc
+  dof_output_operator.cc
   point_value_history.cc
   solution_transfer.cc
   time_dependent.cc
@@ -33,7 +33,7 @@ SET(inst_in_files
   matrix_free.inst.in
   mesh_worker_info.inst.in
   mesh_worker_vector_selector.inst.in
-  operator.inst.in
+  dof_output_operator.inst.in
   point_value_history.inst.in
   solution_transfer.inst.in
   time_dependent.inst.in

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.