From 589b6dad08ba31d1557c7657126c8745556bcabe Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 15 Sep 2013 09:57:54 +0000 Subject: [PATCH] Merge branch trunk into branch_port_the_testsuite git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30710 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_expand_instantiations.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deal.II/cmake/macros/macro_expand_instantiations.cmake b/deal.II/cmake/macros/macro_expand_instantiations.cmake index c842ba0d96..684860d475 100644 --- a/deal.II/cmake/macros/macro_expand_instantiations.cmake +++ b/deal.II/cmake/macros/macro_expand_instantiations.cmake @@ -41,10 +41,10 @@ MACRO(EXPAND_INSTANTIATIONS _target _inst_in_files) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_inst_file} DEPENDS expand_instantiations - ${CMAKE_BINARY_DIR}/cmake/config/template-arguments + ${CMAKE_BINARY_DIR}/${DEAL_II_COMMON_RELDIR}/template-arguments ${CMAKE_CURRENT_SOURCE_DIR}/${_inst_in_file} COMMAND expand_instantiations - ARGS ${CMAKE_BINARY_DIR}/cmake/config/template-arguments + ARGS ${CMAKE_BINARY_DIR}/${DEAL_II_COMMON_RELDIR}/template-arguments < ${CMAKE_CURRENT_SOURCE_DIR}/${_inst_in_file} > ${CMAKE_CURRENT_BINARY_DIR}/${_inst_file} ) -- 2.39.5