From: maier Date: Thu, 9 Aug 2012 09:37:21 +0000 (+0000) Subject: Fix some minor mistakes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c8d179dd61a2e71709ec9010c10eefaff4eca58;p=dealii-svn.git Fix some minor mistakes git-svn-id: https://svn.dealii.org/branches/branch_cmake@25797 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake b/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake index e55692c886..3739f311c1 100644 --- a/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake +++ b/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake @@ -6,6 +6,7 @@ MACRO(macro_expand_instantiations target inst_in_files) ADD_CUSTOM_COMMAND ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${inst_file} DEPENDS expand_instantiations + ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file} COMMAND expand_instantiations ARGS ${CMAKE_BINARY_DIR}/common/expand_instantiations/template-arguments < ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file} diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index 9aba1bf5a1..8a7ab9636b 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -8,7 +8,7 @@ ADD_SUBDIRECTORY(lac) ADD_SUBDIRECTORY(multigrid) ADD_SUBDIRECTORY(numerics) -ADD_LIBRARY(deal.II +ADD_LIBRARY(deal_II $ $ $