]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
A better location for the configured files
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 09:37:10 +0000 (09:37 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 09:37:10 +0000 (09:37 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25796 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/common/expand_instantiations/CMakeLists.txt
deal.II/contrib/cmake/Macros/macro_expand_instantiations.cmake
deal.II/include/CMakeLists.txt

index b6c901072ef676d7bb14f588cb87302f6e3b8dc1..c55a566c12a5858a4c69f2f203ed51667e612483 100644 (file)
@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/contrib #TODO
 
   ${CMAKE_SOURCE_DIR}/include/
-  ${CMAKE_BINARY_DIR}/configured/
+  ${CMAKE_BINARY_DIR}/include/
   )
 
 
index d42be953555ba161d0c9f98458454daf3b489fc7..fdd4c914117fc33d8d8cc9797cdd951cb32150a9 100644 (file)
@@ -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
   )
index 7c6dcb20266e80b478302f836d6d495ce6b068ff..e55692c88608fc80a4cb40b9b2a7278f4b5a09c7 100644 (file)
@@ -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}
       )
index 5540723382ec91214f0599cc87eaf7b98fa267f5..8fc14ed5e29bd7e688103774cfbb920af6ebfa10 100644 (file)
@@ -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
   )

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.