From 2ada4e59e586fa6d8c857e0d35aacc0542d5e73c Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 9 Aug 2012 10:14:22 +0000 Subject: [PATCH] Roundup git-svn-id: https://svn.dealii.org/branches/branch_cmake@25799 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 2 +- .../{Macros => macros}/macro_expand_instantiations.cmake | 2 +- deal.II/source/numerics/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename deal.II/contrib/cmake/{Macros => macros}/macro_expand_instantiations.cmake (96%) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index c55a566c12..792d8dc579 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -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) diff --git a/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake b/deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake 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 3739f311c1..c2f1fce57a 100644 --- a/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake +++ b/deal.II/contrib/cmake/macros/macro_expand_instantiations.cmake @@ -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} diff --git a/deal.II/source/numerics/CMakeLists.txt b/deal.II/source/numerics/CMakeLists.txt index 4d270068e0..3f26a83815 100644 --- a/deal.II/source/numerics/CMakeLists.txt +++ b/deal.II/source/numerics/CMakeLists.txt @@ -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 -- 2.39.5