From a93149c762b637027b01b7d005d21e4ffcc0234b Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 25 Sep 2012 17:40:46 +0000 Subject: [PATCH] The last parts of code duplication git-svn-id: https://svn.dealii.org/branches/branch_cmake@26732 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 7 ------- deal.II/cmake/setup_custom_targets.cmake | 18 +++--------------- deal.II/include/CMakeLists.txt | 3 --- deal.II/source/base/CMakeLists.txt | 1 - deal.II/source/distributed/CMakeLists.txt | 2 +- deal.II/source/dofs/CMakeLists.txt | 2 +- deal.II/source/fe/CMakeLists.txt | 2 +- deal.II/source/grid/CMakeLists.txt | 2 +- deal.II/source/hp/CMakeLists.txt | 2 +- deal.II/source/lac/CMakeLists.txt | 6 +++++- deal.II/source/multigrid/CMakeLists.txt | 2 +- deal.II/source/numerics/CMakeLists.txt | 2 +- 12 files changed, 15 insertions(+), 34 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 625e9a6fa9..35b0c53045 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -201,13 +201,6 @@ INCLUDE(setup_deal_ii) INCLUDE(setup_compiler_flags) -# -# A custom target for all the target dependencies that have to be -# build/prepared before the deal.II library can be compiled -# -ADD_CUSTOM_TARGET(deal_ii_target_dependencies) - - # # Run all system checks: # diff --git a/deal.II/cmake/setup_custom_targets.cmake b/deal.II/cmake/setup_custom_targets.cmake index 823424231e..7cfd2be836 100644 --- a/deal.II/cmake/setup_custom_targets.cmake +++ b/deal.II/cmake/setup_custom_targets.cmake @@ -10,24 +10,12 @@ # # library, documentation, compat_files, project_config # -# And a release and debug target (depending on configuration) -# ADD_CUSTOM_TARGET(library) -IF(CMAKE_BUILD_TYPE MATCHES "Debug") - ADD_CUSTOM_TARGET(debug) - - ADD_DEPENDENCIES(library ${DEAL_II_BASE_NAME}${DEAL_II_DEBUG_SUFFIX}) - ADD_DEPENDENCIES(debug ${DEAL_II_BASE_NAME}${DEAL_II_DEBUG_SUFFIX}) -ENDIF() - -IF(CMAKE_BUILD_TYPE MATCHES "Release") - ADD_CUSTOM_TARGET(release) - - ADD_DEPENDENCIES(library ${DEAL_II_BASE_NAME}) - ADD_DEPENDENCIES(release ${DEAL_II_BASE_NAME}) -ENDIF() +FOREACH(build ${DEAL_II_BUILD_TYPES}) + ADD_DEPENDENCIES(library ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}) +ENDFOREACH() IF(DEAL_II_COMPONENT_DOCUMENTATION) diff --git a/deal.II/include/CMakeLists.txt b/deal.II/include/CMakeLists.txt index 8556b7e23f..303e97f671 100644 --- a/deal.II/include/CMakeLists.txt +++ b/deal.II/include/CMakeLists.txt @@ -23,9 +23,6 @@ ADD_CUSTOM_TARGET(lapack_templates ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/lapack_templates.h ) -ADD_DEPENDENCIES(deal_ii_target_dependencies lapack_templates) - - # # Add a rule on how to install the header files: # diff --git a/deal.II/source/base/CMakeLists.txt b/deal.II/source/base/CMakeLists.txt index 17bc7399e4..1d7938c776 100644 --- a/deal.II/source/base/CMakeLists.txt +++ b/deal.II/source/base/CMakeLists.txt @@ -47,5 +47,4 @@ SET(src_base ) DEAL_II_ADD_LIBRARY(obj_base OBJECT ${src_base}) -DEAL_II_ADD_DEPENDENCIES(obj_base deal_ii_target_dependencies) diff --git a/deal.II/source/distributed/CMakeLists.txt b/deal.II/source/distributed/CMakeLists.txt index e5c21cbec8..4ee29c53e5 100644 --- a/deal.II/source/distributed/CMakeLists.txt +++ b/deal.II/source/distributed/CMakeLists.txt @@ -12,4 +12,4 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_distributed OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_distributed "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_distributed deal_ii_target_dependencies) + diff --git a/deal.II/source/dofs/CMakeLists.txt b/deal.II/source/dofs/CMakeLists.txt index cc8db53bf8..cd0f7ad46a 100644 --- a/deal.II/source/dofs/CMakeLists.txt +++ b/deal.II/source/dofs/CMakeLists.txt @@ -22,4 +22,4 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_dofs OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_dofs "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_dofs deal_ii_target_dependencies) + diff --git a/deal.II/source/fe/CMakeLists.txt b/deal.II/source/fe/CMakeLists.txt index e1653eed47..1bab61bfa6 100644 --- a/deal.II/source/fe/CMakeLists.txt +++ b/deal.II/source/fe/CMakeLists.txt @@ -67,4 +67,4 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_fe OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_fe "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_fe deal_ii_target_dependencies) + diff --git a/deal.II/source/grid/CMakeLists.txt b/deal.II/source/grid/CMakeLists.txt index bd5e2c8f67..bb10b6009b 100644 --- a/deal.II/source/grid/CMakeLists.txt +++ b/deal.II/source/grid/CMakeLists.txt @@ -32,4 +32,4 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_grid OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_grid "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_grid deal_ii_target_dependencies) + diff --git a/deal.II/source/hp/CMakeLists.txt b/deal.II/source/hp/CMakeLists.txt index 6bdbe68416..eedca531d4 100644 --- a/deal.II/source/hp/CMakeLists.txt +++ b/deal.II/source/hp/CMakeLists.txt @@ -17,4 +17,4 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_hp OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_hp "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_hp deal_ii_target_dependencies) + diff --git a/deal.II/source/lac/CMakeLists.txt b/deal.II/source/lac/CMakeLists.txt index fbaa195dae..a041885863 100644 --- a/deal.II/source/lac/CMakeLists.txt +++ b/deal.II/source/lac/CMakeLists.txt @@ -80,4 +80,8 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_lac OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_lac "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_lac deal_ii_target_dependencies) + +# +# TODO: Remove this dependency when lapack_templates is removed +# +ADD_DEPENDENCIES(obj_lac.inst lapack_templates) diff --git a/deal.II/source/multigrid/CMakeLists.txt b/deal.II/source/multigrid/CMakeLists.txt index f350671bfa..9cb5a38650 100644 --- a/deal.II/source/multigrid/CMakeLists.txt +++ b/deal.II/source/multigrid/CMakeLists.txt @@ -20,4 +20,4 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_multigrid OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_multigrid "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_multigrid deal_ii_target_dependencies) + diff --git a/deal.II/source/numerics/CMakeLists.txt b/deal.II/source/numerics/CMakeLists.txt index f98d5cfd8a..63bcf9faa0 100644 --- a/deal.II/source/numerics/CMakeLists.txt +++ b/deal.II/source/numerics/CMakeLists.txt @@ -42,4 +42,4 @@ SET(inst_in_files DEAL_II_ADD_LIBRARY(obj_numerics OBJECT ${src}) EXPAND_INSTANTIATIONS(obj_numerics "${inst_in_files}") -DEAL_II_ADD_DEPENDENCIES(obj_numerics deal_ii_target_dependencies) + -- 2.39.5