From: maier Date: Thu, 9 Aug 2012 09:37:10 +0000 (+0000) Subject: A better location for the configured files X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e5f3d8302113411f48ccd8d67fb991b1a621c8;p=dealii-svn.git A better location for the configured files git-svn-id: https://svn.dealii.org/branches/branch_cmake@25796 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index b6c901072e..c55a566c12 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/contrib #TODO ${CMAKE_SOURCE_DIR}/include/ - ${CMAKE_BINARY_DIR}/configured/ + ${CMAKE_BINARY_DIR}/include/ ) diff --git a/deal.II/common/expand_instantiations/CMakeLists.txt b/deal.II/common/expand_instantiations/CMakeLists.txt index d42be95355..fdd4c91411 100644 --- a/deal.II/common/expand_instantiations/CMakeLists.txt +++ b/deal.II/common/expand_instantiations/CMakeLists.txt @@ -2,5 +2,5 @@ ADD_EXECUTABLE(expand_instantiations expand_instantiations.cc) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/template-arguments.in - ${CMAKE_BINARY_DIR}/configured/template-arguments + ${CMAKE_CURRENT_BINARY_DIR}/template-arguments ) diff --git a/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake b/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake index 7c6dcb2026..e55692c886 100644 --- a/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake +++ b/deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake @@ -7,7 +7,7 @@ MACRO(macro_expand_instantiations target inst_in_files) OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${inst_file} DEPENDS expand_instantiations COMMAND expand_instantiations - ARGS ${CMAKE_BINARY_DIR}/configured/template-arguments + ARGS ${CMAKE_BINARY_DIR}/common/expand_instantiations/template-arguments < ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file} > ${CMAKE_CURRENT_BINARY_DIR}/${inst_file} ) diff --git a/deal.II/include/CMakeLists.txt b/deal.II/include/CMakeLists.txt index 5540723382..8fc14ed5e2 100644 --- a/deal.II/include/CMakeLists.txt +++ b/deal.II/include/CMakeLists.txt @@ -1,9 +1,9 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/deal.II/lac/lapack_templates.h.in - ${CMAKE_BINARY_DIR}/configured/deal.II/lac/lapack_templates.h #TODO + ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/lapack_templates.h ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/deal.II/base/config.h.in - ${CMAKE_BINARY_DIR}/configured/deal.II/base/config.h #TODO + ${CMAKE_CURRENT_BINARY_DIR}/deal.II/base/config.h )