]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
The last parts of code duplication
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 17:40:46 +0000 (17:40 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 17:40:46 +0000 (17:40 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26732 0785d39b-7218-0410-832d-ea1e28bc413d

12 files changed:
deal.II/CMakeLists.txt
deal.II/cmake/setup_custom_targets.cmake
deal.II/include/CMakeLists.txt
deal.II/source/base/CMakeLists.txt
deal.II/source/distributed/CMakeLists.txt
deal.II/source/dofs/CMakeLists.txt
deal.II/source/fe/CMakeLists.txt
deal.II/source/grid/CMakeLists.txt
deal.II/source/hp/CMakeLists.txt
deal.II/source/lac/CMakeLists.txt
deal.II/source/multigrid/CMakeLists.txt
deal.II/source/numerics/CMakeLists.txt

index 625e9a6fa9363b953ae67cbf3f8d2c4b1b42f1f2..35b0c530451fc09c3d7f89e8dabe8b31fc650a2a 100644 (file)
@@ -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:
 #
index 823424231e168a5e0fd04b41bcd14d2e311b83dd..7cfd2be836c0527f5fd958ef3f8244446930bab1 100644 (file)
 #
 #   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)
index 8556b7e23f195f22fcdd93fdd17e8a992bc0fdaf..303e97f6718befdea9d9400ef545456efc8729be 100644 (file)
@@ -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:
 #
index 17bc7399e43a5886a135521b7850cdb34bbb5d5b..1d7938c776e7a530c1b379e7194a33585b77ab2c 100644 (file)
@@ -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)
 
index e5c21cbec88f86496b343eaaa472f6ebbfd3f55c..4ee29c53e50aba4eab24ba8ff47f2816cc502488 100644 (file)
@@ -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)
+
index cc8db53bf88ffb19f892611d582a1dfcb11d733f..cd0f7ad46a63b86d1481178add4c7f0b52d2f5c8 100644 (file)
@@ -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)
+
index e1653eed47cdf954f7e273fd84570301952c66c4..1bab61bfa6e11a503bfda75f792a49e096d4b97c 100644 (file)
@@ -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)
+
index bd5e2c8f67ad6318afa691c939f0c830270f0427..bb10b6009b73b37a9a9c7d9d9f3346289bd4cd28 100644 (file)
@@ -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)
+
index 6bdbe6841608f6280312de05fee73a5374e0dc62..eedca531d41b39844b78bcd7b8514c5244a01ea5 100644 (file)
@@ -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)
+
index fbaa195dae19d67d996c3aa50d4eb817f1668c41..a04188586399396d3d60ad3aaf2ec0e4de77564c 100644 (file)
@@ -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)
index f350671bfa383d722a14774d7ee2258c157e45ac..9cb5a3865062672b4a2aeea99a8c78702de00f79 100644 (file)
@@ -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)
+
index f98d5cfd8a8892c48ec442dc40f65b94f6b4a721..63bcf9faa0dad23817a898d6d615c2e237fd5d48 100644 (file)
@@ -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)
+

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.