CMake: introduce define_object_target() and harmonize naming

diff --git a/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt b/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt
index 34e3572668e11f937de83c99f4e9640daf002b4f..4c672a22245dd89a96c96bb2f2bcf0f39ac21aa0 100644 (file)
--- a/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt
+++ b/bundled/boost-1.70.0/libs/iostreams/src/CMakeLists.txt
@@ -24,4 +24,4 @@ enable_if_supported(DEAL_II_CXX_FLAGS -Wno-c11-extensions)
 enable_if_supported(DEAL_II_CXX_FLAGS -Wno-deprecated-copy)
 enable_if_supported(DEAL_II_CXX_FLAGS -Wno-uninitialized)
 
-deal_ii_add_library(obj_boost_iostreams OBJECT ${src_boost_iostreams})
+define_object_library(bundled_boost_iostreams OBJECT ${src_boost_iostreams})

diff --git a/bundled/boost-1.70.0/libs/serialization/src/CMakeLists.txt b/bundled/boost-1.70.0/libs/serialization/src/CMakeLists.txt
index 0f633ed25bc3c5b120e63310017071494428ef0f..91097eb0448deecccddae83136322743d57a8e3b 100644 (file)
--- a/bundled/boost-1.70.0/libs/serialization/src/CMakeLists.txt
+++ b/bundled/boost-1.70.0/libs/serialization/src/CMakeLists.txt
@@ -58,4 +58,4 @@ enable_if_supported(DEAL_II_CXX_FLAGS -Wno-c11-extensions)
 enable_if_supported(DEAL_II_CXX_FLAGS -Wno-deprecated-copy)
 enable_if_supported(DEAL_II_CXX_FLAGS -Wno-uninitialized)
 
-deal_ii_add_library(obj_boost_serialization OBJECT ${src_boost_serialization})
+define_object_library(bundled_boost_serialization OBJECT ${src_boost_serialization})

diff --git a/bundled/boost-1.70.0/libs/system/src/CMakeLists.txt b/bundled/boost-1.70.0/libs/system/src/CMakeLists.txt
index a3b6ebc67ebeeeaaa570357d65d2a2d3dd2d28e1..28655b04f963fc433d8ffa8f93e6ac760ce0ae95 100644 (file)
--- a/bundled/boost-1.70.0/libs/system/src/CMakeLists.txt
+++ b/bundled/boost-1.70.0/libs/system/src/CMakeLists.txt
@@ -18,5 +18,5 @@ set(src_boost_system
   error_code.cpp
   )
 
-deal_ii_add_library(obj_boost_system OBJECT ${src_boost_system})
+define_object_library(bundled_boost_system OBJECT ${src_boost_system})
 

diff --git a/bundled/kokkos-3.7.00/CMakeLists.txt b/bundled/kokkos-3.7.00/CMakeLists.txt
index 964f8f5fbaf9dd3bad7a63762fa4dc8a32b9655b..5c225804a5b9d58457ba3b21fe41cddd33c77c4f 100644 (file)
--- a/bundled/kokkos-3.7.00/CMakeLists.txt
+++ b/bundled/kokkos-3.7.00/CMakeLists.txt
@@ -69,4 +69,4 @@ enable_if_supported(DEAL_II_CXX_FLAGS -Wno-missing-field-initializers)
 enable_if_supported(DEAL_II_CXX_FLAGS -Wno-suggest-override)
 enable_if_supported(DEAL_II_CXX_FLAGS -Wno-unused-but-set-parameter)
 
-deal_ii_add_library(obj_kokkos OBJECT ${src_kokkos})
+define_object_library(bundled_kokkos OBJECT ${src_kokkos})

diff --git a/bundled/muparser_v2_3_3/CMakeLists.txt b/bundled/muparser_v2_3_3/CMakeLists.txt
index 5a3139bd111f0fa1d34185282fdcbcd377bfaebd..7ab7c80942a44ec636ed23c77d67da5191f93501 100644 (file)
--- a/bundled/muparser_v2_3_3/CMakeLists.txt
+++ b/bundled/muparser_v2_3_3/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(
   include/
 )
 
-deal_ii_add_library(obj_muparser OBJECT
+define_object_library(bundled_muparser OBJECT
   src/muParserBase.cpp
   src/muParserBytecode.cpp
   src/muParserCallback.cpp

diff --git a/bundled/tbb-2018_U2/src/CMakeLists.txt b/bundled/tbb-2018_U2/src/CMakeLists.txt
index 9a9310102fc25d0e59a526d52990c09107d40c86..7a9b9204c65e2f6667b319ca2508664381bc9e73 100644 (file)
--- a/bundled/tbb-2018_U2/src/CMakeLists.txt
+++ b/bundled/tbb-2018_U2/src/CMakeLists.txt
@@ -89,14 +89,14 @@ set(src_tbb
   tbb/tbb_thread.cpp
   tbb/x86_rtm_rw_mutex.cpp
   )
-deal_ii_add_library(obj_tbb OBJECT ${src_tbb})
+define_object_library(bundled_tbb OBJECT ${src_tbb})
 
 #
 # Add necessary definitions:
 #
 
-deal_ii_add_definitions(obj_tbb "__TBB_BUILD=1")
-deal_ii_add_definitions(obj_tbb "USE_PTHREAD")
+deal_ii_add_definitions(bundled_tbb "__TBB_BUILD=1")
+deal_ii_add_definitions(bundled_tbb "USE_PTHREAD")
 if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  deal_ii_add_definitions(obj_tbb "DO_ITT_NOTIFY")
+  deal_ii_add_definitions(bundled_tbb "DO_ITT_NOTIFY")
 endif()

diff --git a/bundled/umfpack/AMD/Source/CMakeLists.txt b/bundled/umfpack/AMD/Source/CMakeLists.txt
index d3c3c5eff96a364179c02036db2d2e114c4abd96..1a9fac9a5a7a2d9ce97eb86392adea2febfe63e5 100644 (file)
--- a/bundled/umfpack/AMD/Source/CMakeLists.txt
+++ b/bundled/umfpack/AMD/Source/CMakeLists.txt
@@ -30,11 +30,11 @@ set(src_amd
   amd_valid.cc
   )
 
-deal_ii_add_library(obj_amd_int OBJECT ${src_amd})
-deal_ii_add_definitions(obj_amd_int "DINT")
+define_object_library(bundled_amd_int OBJECT ${src_amd})
+deal_ii_add_definitions(bundled_amd_int "DINT")
 
-deal_ii_add_library(obj_amd_long OBJECT ${src_amd})
-deal_ii_add_definitions(obj_amd_long "DLONG")
+define_object_library(bundled_amd_long OBJECT ${src_amd})
+deal_ii_add_definitions(bundled_amd_long "DLONG")
 
-deal_ii_add_library(obj_amd_global OBJECT "amd_global.cc")
+define_object_library(bundled_amd_global OBJECT "amd_global.cc")
 

diff --git a/bundled/umfpack/UMFPACK/Source/CMakeLists.txt b/bundled/umfpack/UMFPACK/Source/CMakeLists.txt
index 6ffffa611eb3c3d4bee42af18f280452ad893450..2c697053eeb1634765161c7a3cb3d00b31e48b13 100644 (file)
--- a/bundled/umfpack/UMFPACK/Source/CMakeLists.txt
+++ b/bundled/umfpack/UMFPACK/Source/CMakeLists.txt
@@ -355,17 +355,17 @@ set(src_umfpack_GENERIC
 #-------------------------------------------------------------------------------
 
 # Do what the GNUmakefile calls the DI targets:
-deal_ii_add_library(obj_umfpack_L_UMF OBJECT ${src_umfpack_DL_AND_ZL})
-deal_ii_add_definitions(obj_umfpack_L_UMF "DLONG")
+define_object_library(bundled_umfpack_L_UMF OBJECT ${src_umfpack_DL_AND_ZL})
+deal_ii_add_definitions(bundled_umfpack_L_UMF "DLONG")
 
 # Repeat these steps for complex-valued matrices. This corresponds to
 # the ZL targets:
-deal_ii_add_library(obj_umfpack_Z_UMF OBJECT ${src_umfpack_DL_AND_ZL})
-deal_ii_add_definitions(obj_umfpack_Z_UMF "ZLONG")
+define_object_library(bundled_umfpack_Z_UMF OBJECT ${src_umfpack_DL_AND_ZL})
+deal_ii_add_definitions(bundled_umfpack_Z_UMF "ZLONG")
 
 # Do what the GNUmakefile calls the LL targets:
-deal_ii_add_library(obj_umfpack_L_UMFPACK OBJECT ${src_umfpack_LL})
-deal_ii_add_definitions(obj_umfpack_L_UMFPACK "DLONG")
+define_object_library(bundled_umfpack_L_UMFPACK OBJECT ${src_umfpack_LL})
+deal_ii_add_definitions(bundled_umfpack_L_UMFPACK "DLONG")
 
 
 #-------------------------------------------------------------------------------
@@ -373,58 +373,58 @@ deal_ii_add_definitions(obj_umfpack_L_UMFPACK "DLONG")
 # version.
 #-------------------------------------------------------------------------------
 
-deal_ii_add_library(obj_umfpack_DL_TSOLVE OBJECT umf_ltsolve.cc umf_utsolve.cc)
-deal_ii_add_definitions(obj_umfpack_DL_TSOLVE "DLONG" "CONJUGATE_SOLVE")
+define_object_library(bundled_umfpack_DL_TSOLVE OBJECT umf_ltsolve.cc umf_utsolve.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_TSOLVE "DLONG" "CONJUGATE_SOLVE")
 
-deal_ii_add_library(obj_umfpack_DL_TRIPLET_MAP_NOX OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_DL_TRIPLET_MAP_NOX "DLONG" "DO_MAP")
+define_object_library(bundled_umfpack_DL_TRIPLET_MAP_NOX OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_TRIPLET_MAP_NOX "DLONG" "DO_MAP")
 
-deal_ii_add_library(obj_umfpack_DL_TRIPLET_MAP_X OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_DL_TRIPLET_MAP_X "DLONG" "DO_MAP" "DO_VALUES")
+define_object_library(bundled_umfpack_DL_TRIPLET_MAP_X OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_TRIPLET_MAP_X "DLONG" "DO_MAP" "DO_VALUES")
 
-deal_ii_add_library(obj_umfpack_DL_TRIPLET_NOMAP_X OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_DL_TRIPLET_NOMAP_X "DLONG" "DO_VALUES")
+define_object_library(bundled_umfpack_DL_TRIPLET_NOMAP_X OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_TRIPLET_NOMAP_X "DLONG" "DO_VALUES")
 
-deal_ii_add_library(obj_umfpack_DL_TRIPLET_NOMAP_NOX OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_DL_TRIPLET_NOMAP_NOX "DLONG")
+define_object_library(bundled_umfpack_DL_TRIPLET_NOMAP_NOX OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_TRIPLET_NOMAP_NOX "DLONG")
 
-deal_ii_add_library(obj_umfpack_DL_STORE OBJECT umf_store_lu.cc)
-deal_ii_add_definitions(obj_umfpack_DL_STORE "DLONG" "DROP")
+define_object_library(bundled_umfpack_DL_STORE OBJECT umf_store_lu.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_STORE "DLONG" "DROP")
 
-deal_ii_add_library(obj_umfpack_DL_ASSEMBLE OBJECT umf_assemble.cc)
-deal_ii_add_definitions(obj_umfpack_DL_ASSEMBLE "DLONG" "FIXQ")
+define_object_library(bundled_umfpack_DL_ASSEMBLE OBJECT umf_assemble.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_ASSEMBLE "DLONG" "FIXQ")
 
-deal_ii_add_library(obj_umfpack_DL_SOLVE OBJECT umfpack_solve.cc)
-deal_ii_add_definitions(obj_umfpack_DL_SOLVE "DLONG" "WSOLVE")
+define_object_library(bundled_umfpack_DL_SOLVE OBJECT umfpack_solve.cc)
+deal_ii_add_definitions(bundled_umfpack_DL_SOLVE "DLONG" "WSOLVE")
 
 # Again with complex arguments:
-deal_ii_add_library(obj_umfpack_ZL_TSOLVE OBJECT umf_ltsolve.cc umf_utsolve.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_TSOLVE "ZLONG" "CONJUGATE_SOLVE")
+define_object_library(bundled_umfpack_ZL_TSOLVE OBJECT umf_ltsolve.cc umf_utsolve.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_TSOLVE "ZLONG" "CONJUGATE_SOLVE")
 
-deal_ii_add_library(obj_umfpack_ZL_TRIPLET_MAP_NOX OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_TRIPLET_MAP_NOX "ZLONG" "DO_MAP")
+define_object_library(bundled_umfpack_ZL_TRIPLET_MAP_NOX OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_TRIPLET_MAP_NOX "ZLONG" "DO_MAP")
 
-deal_ii_add_library(obj_umfpack_ZL_TRIPLET_MAP_X OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_TRIPLET_MAP_X "ZLONG" "DO_MAP" "DO_VALUES")
+define_object_library(bundled_umfpack_ZL_TRIPLET_MAP_X OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_TRIPLET_MAP_X "ZLONG" "DO_MAP" "DO_VALUES")
 
-deal_ii_add_library(obj_umfpack_ZL_TRIPLET_NOMAP_X OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_TRIPLET_NOMAP_X "ZLONG" "DO_VALUES")
+define_object_library(bundled_umfpack_ZL_TRIPLET_NOMAP_X OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_TRIPLET_NOMAP_X "ZLONG" "DO_VALUES")
 
-deal_ii_add_library(obj_umfpack_ZL_TRIPLET_NOMAP_NOX OBJECT umf_triplet.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_TRIPLET_NOMAP_NOX "ZLONG")
+define_object_library(bundled_umfpack_ZL_TRIPLET_NOMAP_NOX OBJECT umf_triplet.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_TRIPLET_NOMAP_NOX "ZLONG")
 
-deal_ii_add_library(obj_umfpack_ZL_STORE OBJECT umf_store_lu.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_STORE "ZLONG" "DROP")
+define_object_library(bundled_umfpack_ZL_STORE OBJECT umf_store_lu.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_STORE "ZLONG" "DROP")
 
-deal_ii_add_library(obj_umfpack_ZL_ASSEMBLE OBJECT umf_assemble.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_ASSEMBLE "ZLONG" "FIXQ")
+define_object_library(bundled_umfpack_ZL_ASSEMBLE OBJECT umf_assemble.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_ASSEMBLE "ZLONG" "FIXQ")
 
-deal_ii_add_library(obj_umfpack_ZL_SOLVE OBJECT umfpack_solve.cc)
-deal_ii_add_definitions(obj_umfpack_ZL_SOLVE "ZLONG" "WSOLVE")
+define_object_library(bundled_umfpack_ZL_SOLVE OBJECT umfpack_solve.cc)
+deal_ii_add_definitions(bundled_umfpack_ZL_SOLVE "ZLONG" "WSOLVE")
 
 #-------------------------------------------------------------------------------
 # Create the generic routines (GN) using a generic rule
 #-------------------------------------------------------------------------------
 
-deal_ii_add_library(obj_umfpack_GENERIC OBJECT ${src_umfpack_GENERIC})
+define_object_library(bundled_umfpack_GENERIC OBJECT ${src_umfpack_GENERIC})
 

diff --git a/cmake/macros/macro_configure_feature.cmake b/cmake/macros/macro_configure_feature.cmake
index c1080faeb6c5fee9db23fc91270c0aec8ea8e3e0..7587eaf0441f9df90cfe9eb4d56f3f6d0f8d524b 100644 (file)
--- a/cmake/macros/macro_configure_feature.cmake
+++ b/cmake/macros/macro_configure_feature.cmake
@@ -250,6 +250,7 @@ macro(configure_feature _feature)
           endif()
           define_interface_target(${_feature})
 
+          message(STATUS "")
           message(STATUS "DEAL_II_WITH_${_feature} successfully set up with external dependencies.")
           set(FEATURE_${_feature}_EXTERNAL_CONFIGURED TRUE)
           set_cached_option(${_feature} ON)
@@ -263,6 +264,7 @@ macro(configure_feature _feature)
           if(FEATURE_${_feature}_HAVE_BUNDLED AND DEAL_II_ALLOW_BUNDLED)
             evaluate_expression("feature_${_feature}_configure_bundled()")
 
+            message(STATUS "")
             message(STATUS "DEAL_II_WITH_${_feature} successfully set up with bundled packages.")
             set(DEAL_II_FEATURE_${_feature}_BUNDLED_CONFIGURED TRUE)
             set_cached_option(${_feature} ON)

diff --git a/cmake/macros/macro_deal_ii_add_definitions.cmake b/cmake/macros/macro_deal_ii_add_definitions.cmake
index c306c9c219249c732b702a4e3d0365e4fc1c284c..19e8f192cd18925942a890ffa6fd1f654a867bc7 100644 (file)
--- a/cmake/macros/macro_deal_ii_add_definitions.cmake
+++ b/cmake/macros/macro_deal_ii_add_definitions.cmake
@@ -15,7 +15,7 @@
 
 #
 # A small wrapper around
-# SET_TARget_property(... PROPERTIES COMPILE_DEFINITIONS ...)
+# set_target_property(... PROPERTIES COMPILE_DEFINITIONS ...)
 # to _add_ compile definitions to every target we have specified.
 #
 

diff --git a/cmake/macros/macro_deal_ii_add_library.cmake b/cmake/macros/macro_deal_ii_add_library.cmake
deleted file mode 100644 (file)
index 7f4c657..0000000
--- a/cmake/macros/macro_deal_ii_add_library.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-## ---------------------------------------------------------------------
-##
-## Copyright (C) 2012 - 2018 by the deal.II authors
-##
-## This file is part of the deal.II library.
-##
-## The deal.II library is free software; you can use it, redistribute
-## it, and/or modify it under the terms of the GNU Lesser General
-## Public License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-## The full text of the license can be found in the file LICENSE.md at
-## the top level directory of deal.II.
-##
-## ---------------------------------------------------------------------
-
-#
-# A small wrapper around ADD_LIBRARY that will define a target for each
-# build type specified in DEAL_II_BUILD_TYPES. Only compatible with object
-# targets (as used in the build system).
-#
-# It is assumed that the desired compilation configuration is set via
-#   DEAL_II_CXX_FLAGS_${build}
-#   DEAL_II_DEFINITIONS_${build}
-#
-# as well as the global (for all build types)
-#   DEAL_II_CXX_FLAGS
-#   DEAL_II_DEFINITIONS
-#
-
-macro(deal_ii_add_library _library)
-
-  foreach(_build ${DEAL_II_BUILD_TYPES})
-    string(TOLOWER ${_build} _build_lowercase)
-
-    add_library(${_library}_${_build_lowercase}
-      ${ARGN}
-      )
-
-    set_target_properties(${_library}_${_build_lowercase} PROPERTIES
-      LINKER_LANGUAGE "CXX"
-      )
-
-    set(_flags "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}")
-
-    # Make sure some CUDA warning flags don't get deduplicated
-    string(REGEX REPLACE "(-Xcudafe --diag_suppress=[^ ]+)" "\"SHELL:\\1\"" _flags ${_flags})
-
-    separate_arguments(_flags UNIX_COMMAND ${_flags})
-
-    target_compile_options(${_library}_${_build_lowercase} PUBLIC ${_flags})
-
-    target_compile_definitions(${_library}_${_build_lowercase}
-      PUBLIC ${DEAL_II_DEFINITIONS} ${DEAL_II_DEFINITIONS_${_build}}
-      )
-
-    target_include_directories(${_library}_${_build_lowercase}
-      PUBLIC ${DEAL_II_INCLUDE_DIRS})
-    target_include_directories(${_library}_${_build_lowercase}
-      SYSTEM PUBLIC ${DEAL_II_BUNDLED_INCLUDE_DIRS})
-
-    set_property(GLOBAL APPEND PROPERTY DEAL_II_OBJECTS_${_build}
-      "$<TARGET_OBJECTS:${_library}_${_build_lowercase}>"
-      )
-  endforeach()
-
-endmacro()

diff --git a/cmake/macros/macro_define_object_target.cmake b/cmake/macros/macro_define_object_target.cmake
new file mode 100644 (file)
index 0000000..f64939f
--- /dev/null
+++ b/cmake/macros/macro_define_object_target.cmake
@@ -0,0 +1,77 @@
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2012 - 2018 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE.md at
+## the top level directory of deal.II.
+##
+## ---------------------------------------------------------------------
+
+#
+# define_object_target(<library>)
+#
+# A small wrapper around add_library that will define a target for each
+# build type specified in DEAL_II_BUILD_TYPES. The specified library name
+# must start with either object_ or bundled_.
+#
+# The function automatically "links" all object targets to the interface
+# targets specified in DEAL_II_TARGETS and DEAL_II_TARGETS_(BUILD|RELEASE).
+# The scope is PUBLIC so that properties of the interface targets propagate
+# to the final shared library targets.
+#
+# In addition, if the library name is of the form "object_*" then all
+# bundled targets are added to the "link" interface as well. The scope is
+# private.
+#
+
+function(define_object_library _library)
+
+  if(NOT "${_library}" MATCHES "^object_" AND NOT "${_library}" MATCHES "^bundled_")
+    message(FATAL_ERROR
+      "Internal error: The specified target name must begin with object_ "
+      "or bundled_. Encountered: ${_library}"
+      )
+  endif()
+
+  foreach(_build ${DEAL_II_BUILD_TYPES})
+    string(TOLOWER ${_build} _build_lowercase)
+
+    add_library(${_library}_${_build_lowercase} ${ARGN})
+
+    set_target_properties(${_library}_${_build_lowercase} PROPERTIES
+      LINKER_LANGUAGE "CXX"
+      )
+
+    target_link_libraries(${_library}_${_build_lowercase}
+      PUBLIC ${DEAL_II_TARGETS} ${DEAL_II_TARGETS_${_build}}
+      )
+
+    if("${_library}" MATCHES "^bundled_")
+      #
+      # Record all bundled object libraries in the global property
+      # DEAL_II_BUNDLED_TARGETS_${_build}
+      #
+      set_property(GLOBAL APPEND PROPERTY DEAL_II_BUNDLED_TARGETS_${_build}
+        ${_library}_${_build_lowercase}
+        )
+    else()
+      get_property(_bundled_object_targets
+        GLOBAL PROPERTY DEAL_II_BUNDLED_TARGETS_${build}
+        )
+      target_link_libraries(${_library}_${_build_lowercase}
+        PRIVATE ${_bundled_object_targets}
+        )
+    endif()
+
+    set_property(GLOBAL APPEND PROPERTY DEAL_II_OBJECT_TARGETS_${_build}
+      ${_library}_${_build_lowercase}
+      )
+  endforeach()
+
+endfunction()

diff --git a/source/algorithms/CMakeLists.txt b/source/algorithms/CMakeLists.txt
index d38d5014749a8492904675f0a7c15ac21d97ebdc..eb1c12e2b2941f27abd003f68aaf2fe3fac33d16 100644 (file)
--- a/source/algorithms/CMakeLists.txt
+++ b/source/algorithms/CMakeLists.txt
@@ -29,5 +29,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/algorithms/*.h
   )
 
-deal_ii_add_library(obj_algorithms OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_algorithms "${_inst}")
+define_object_library(object_algorithms OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_algorithms "${_inst}")

diff --git a/source/arborx/CMakeLists.txt b/source/arborx/CMakeLists.txt
index 65c200bf584ba7e1cdc0925e08b818bdbf246154..fc2c709f9f0d01893f77d87bfd5ca9dea783db8b 100644 (file)
--- a/source/arborx/CMakeLists.txt
+++ b/source/arborx/CMakeLists.txt
@@ -27,5 +27,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/arborx/*.h
   )
 
-deal_ii_add_library(obj_arborx OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_arborx "${_inst}")
+define_object_library(object_arborx OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_arborx "${_inst}")

diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt
index 1768b520be566828fd3b958d520d7089525f9637..ed6baf880c983f126908e177be21653f112acd3e 100644 (file)
--- a/source/base/CMakeLists.txt
+++ b/source/base/CMakeLists.txt
@@ -155,7 +155,7 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/base/*.h
   )
 
-deal_ii_add_library(obj_base OBJECT ${_src} ${_header} ${_inst}
+define_object_library(object_base OBJECT ${_src} ${_header} ${_inst}
   ${CMAKE_BINARY_DIR}/include/deal.II/base/config.h
   )
-expand_instantiations(obj_base "${_inst}")
+expand_instantiations(object_base "${_inst}")

diff --git a/source/cgal/CMakeLists.txt b/source/cgal/CMakeLists.txt
index c47b4e5babf4281eb2b962f12f4934101d44ea79..8898bc44a19336ca8df78a65ea936af0889523f5 100644 (file)
--- a/source/cgal/CMakeLists.txt
+++ b/source/cgal/CMakeLists.txt
@@ -33,5 +33,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/cgal/*.h
   )
 
-deal_ii_add_library(obj_cgal OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_cgal "${_inst}")
+define_object_library(object_cgal OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_cgal "${_inst}")

diff --git a/source/differentiation/ad/CMakeLists.txt b/source/differentiation/ad/CMakeLists.txt
index 92861074f72df17a003036130c30449a1ce1e88b..f0d77650e022d47674fab34184c7210333dbc0ff 100644 (file)
--- a/source/differentiation/ad/CMakeLists.txt
+++ b/source/differentiation/ad/CMakeLists.txt
@@ -38,5 +38,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/differentiation/ad/*.h
   )
 
-deal_ii_add_library(obj_differentiation_ad OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_differentiation_ad "${_inst}")
+define_object_library(object_differentiation_ad OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_differentiation_ad "${_inst}")

diff --git a/source/differentiation/sd/CMakeLists.txt b/source/differentiation/sd/CMakeLists.txt
index 5de96d1ca6d7ebd8f77ab87fc1159579fb17207f..a545a01a6f9ae0d51babc6a3bc8e4fd4906c6e09 100644 (file)
--- a/source/differentiation/sd/CMakeLists.txt
+++ b/source/differentiation/sd/CMakeLists.txt
@@ -36,5 +36,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/differentiation/sd/*.h
   )
 
-deal_ii_add_library(obj_differentiation_sd OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_differentiation_sd "${_inst}")
+define_object_library(object_differentiation_sd OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_differentiation_sd "${_inst}")

diff --git a/source/distributed/CMakeLists.txt b/source/distributed/CMakeLists.txt
index 1964c91bb8d688e428ab5cc92e47dedaee44d4cd..86a2350fd79cfb33e39c990e619c5ff54d2295dd 100644 (file)
--- a/source/distributed/CMakeLists.txt
+++ b/source/distributed/CMakeLists.txt
@@ -59,5 +59,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/distributed/*.h
   )
 
-deal_ii_add_library(obj_distributed OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_distributed "${_inst}")
+define_object_library(object_distributed OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_distributed "${_inst}")

diff --git a/source/dofs/CMakeLists.txt b/source/dofs/CMakeLists.txt
index 14d583940ad9bc98dca83348bf9f23b70802a90c..aa49031970f2c4b016efeadfc01fe2e7d614045b 100644 (file)
--- a/source/dofs/CMakeLists.txt
+++ b/source/dofs/CMakeLists.txt
@@ -61,5 +61,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/dofs/*.h
   )
 
-deal_ii_add_library(obj_dofs OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_dofs "${_inst}")
+define_object_library(object_dofs OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_dofs "${_inst}")

diff --git a/source/fe/CMakeLists.txt b/source/fe/CMakeLists.txt
index 776c82fe45fbb1d5226bb3124419101c0b8ece8f..7f88c1771db18a6f1e3ce474786c2c705bc42031 100644 (file)
--- a/source/fe/CMakeLists.txt
+++ b/source/fe/CMakeLists.txt
@@ -150,5 +150,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/fe/*.h
   )
 
-deal_ii_add_library(obj_fe OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_fe "${_inst}")
+define_object_library(object_fe OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_fe "${_inst}")

diff --git a/source/gmsh/CMakeLists.txt b/source/gmsh/CMakeLists.txt
index 66d853f3a37fae1916478713a7dbc834be6321e0..270faa21fff2cbe4c78cafcd93133be246d11daf 100644 (file)
--- a/source/gmsh/CMakeLists.txt
+++ b/source/gmsh/CMakeLists.txt
@@ -27,5 +27,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/gmsh/*.h
   )
 
-deal_ii_add_library(obj_gmsh OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_gmsh "${_inst}")
+define_object_library(object_gmsh OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_gmsh "${_inst}")

diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt
index 079d416ea677339c26086eeaed819201cc005582..6d2a9641690dcab62e7a9cdabfa1ac5352dd7795 100644 (file)
--- a/source/grid/CMakeLists.txt
+++ b/source/grid/CMakeLists.txt
@@ -97,5 +97,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/grid/*.h
   )
 
-deal_ii_add_library(obj_grid OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_grid "${_inst}")
+define_object_library(object_grid OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_grid "${_inst}")

diff --git a/source/hp/CMakeLists.txt b/source/hp/CMakeLists.txt
index 0f310715af7184978934576372d691587756c235..e7544c3aa1fa35b546ce8e81ef5cad210358217e 100644 (file)
--- a/source/hp/CMakeLists.txt
+++ b/source/hp/CMakeLists.txt
@@ -45,5 +45,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/hp/*.h
   )
 
-deal_ii_add_library(obj_hp OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_hp "${_inst}")
+define_object_library(object_hp OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_hp "${_inst}")

diff --git a/source/integrators/CMakeLists.txt b/source/integrators/CMakeLists.txt
index e0381dde06c490e85732ee427d11cdf31e102dad..5804c13ab3aa1a6fa02e532b5c95771d504abdfc 100644 (file)
--- a/source/integrators/CMakeLists.txt
+++ b/source/integrators/CMakeLists.txt
@@ -22,4 +22,4 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/integrators/*.h
   )
 
-deal_ii_add_library(obj_integrators OBJECT ${_src} ${_header})
+define_object_library(object_integrators OBJECT ${_src} ${_header})

diff --git a/source/lac/CMakeLists.txt b/source/lac/CMakeLists.txt
index da74b1d615ed432f936bf2f0a00a6a19340ede4b..d1b9568113c387749d45b8f6abdf64bc358345e8 100644 (file)
--- a/source/lac/CMakeLists.txt
+++ b/source/lac/CMakeLists.txt
@@ -192,5 +192,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/lac/*.h
   )
 
-deal_ii_add_library(obj_lac OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_lac "${_inst}")
+define_object_library(object_lac OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_lac "${_inst}")

diff --git a/source/matrix_free/CMakeLists.txt b/source/matrix_free/CMakeLists.txt
index 4002f809d2a6d7c6f7c21bdf56d30eeac2c77d63..e0297cfc36646333053cb6d2340cd45f6a5dc6fd 100644 (file)
--- a/source/matrix_free/CMakeLists.txt
+++ b/source/matrix_free/CMakeLists.txt
@@ -64,5 +64,5 @@ if(DEAL_II_WITH_CUDA)
     )
 endif()
 
-deal_ii_add_library(obj_matrix_free OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_matrix_free "${_inst}")
+define_object_library(object_matrix_free OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_matrix_free "${_inst}")

diff --git a/source/meshworker/CMakeLists.txt b/source/meshworker/CMakeLists.txt
index dd31a12d2abdd76f774f26fd2d3a399e6dd6e7f5..d541931787b480bb8d03deca1376d6fe11197a59 100644 (file)
--- a/source/meshworker/CMakeLists.txt
+++ b/source/meshworker/CMakeLists.txt
@@ -32,5 +32,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/meshworker/*.h
   )
 
-deal_ii_add_library(obj_meshworker OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_meshworker "${_inst}")
+define_object_library(object_meshworker OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_meshworker "${_inst}")

diff --git a/source/multigrid/CMakeLists.txt b/source/multigrid/CMakeLists.txt
index bd11cf289fb9765983217d44afbf1839cfc5465a..6c8bf3ec569cb14b48cee6a6bd46dab1d6262d02 100644 (file)
--- a/source/multigrid/CMakeLists.txt
+++ b/source/multigrid/CMakeLists.txt
@@ -57,5 +57,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/multigrid/*.h
   )
 
-deal_ii_add_library(obj_multigrid OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_multigrid "${_inst}")
+define_object_library(object_multigrid OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_multigrid "${_inst}")

diff --git a/source/non_matching/CMakeLists.txt b/source/non_matching/CMakeLists.txt
index 10385cb64a939410c8b74c02bc80720fcfbb5038..6b7837b127417eed13545c784e67f76295697a0b 100644 (file)
--- a/source/non_matching/CMakeLists.txt
+++ b/source/non_matching/CMakeLists.txt
@@ -36,5 +36,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/non_matching/*.h
   )
 
-deal_ii_add_library(obj_non_matching OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_non_matching "${_inst}")
+define_object_library(object_non_matching OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_non_matching "${_inst}")

diff --git a/source/numerics/CMakeLists.txt b/source/numerics/CMakeLists.txt
index b3f277c35cd0e1793394e70ec1aec975fc4acd1a..f8f61fdd331320f27efa1f206332740d395f1e31 100644 (file)
--- a/source/numerics/CMakeLists.txt
+++ b/source/numerics/CMakeLists.txt
@@ -112,5 +112,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/numerics/*.h
   )
 
-deal_ii_add_library(obj_numerics OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_numerics "${_inst}")
+define_object_library(object_numerics OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_numerics "${_inst}")

diff --git a/source/opencascade/CMakeLists.txt b/source/opencascade/CMakeLists.txt
index 444da92ddf4d1540d637094cf58446c28ef5ca98..a5b03c3db6f62b20fda6b26a0d1ba310b5f719be 100644 (file)
--- a/source/opencascade/CMakeLists.txt
+++ b/source/opencascade/CMakeLists.txt
@@ -29,5 +29,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/opencascade/*.h
   )
 
-deal_ii_add_library(obj_opencascade OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_opencascade "${_inst}")
+define_object_library(object_opencascade OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_opencascade "${_inst}")

diff --git a/source/optimization/rol/CMakeLists.txt b/source/optimization/rol/CMakeLists.txt
index 4c08aa314de4620bd4d8c526d862e4faf76b38b3..f826d7ee3accf8fff3883a753842410a9177957d 100644 (file)
--- a/source/optimization/rol/CMakeLists.txt
+++ b/source/optimization/rol/CMakeLists.txt
@@ -25,5 +25,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/optimization/rol/*.h
   )
 
-deal_ii_add_library(obj_rol OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_rol "${_inst}")
+define_object_library(object_rol OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_rol "${_inst}")

diff --git a/source/particles/CMakeLists.txt b/source/particles/CMakeLists.txt
index c01bc32183b927ad2984a567d20d6e594b64557d..30a8b472d6d8a7b895fc97c74496e5ee43205a98 100644 (file)
--- a/source/particles/CMakeLists.txt
+++ b/source/particles/CMakeLists.txt
@@ -37,5 +37,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/particles/*.h
   )
 
-deal_ii_add_library(obj_particle OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_particle "${_inst}")
+define_object_library(object_particle OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_particle "${_inst}")

diff --git a/source/physics/CMakeLists.txt b/source/physics/CMakeLists.txt
index 2288388548251f4257df88d53a3bd225a4edfd29..79eab43f6fcde47f00cd0117240e253b98bcc075 100644 (file)
--- a/source/physics/CMakeLists.txt
+++ b/source/physics/CMakeLists.txt
@@ -30,5 +30,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/physics/*.h
   )
 
-deal_ii_add_library(obj_physics OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_physics "${_inst}")
+define_object_library(object_physics OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_physics "${_inst}")

diff --git a/source/physics/elasticity/CMakeLists.txt b/source/physics/elasticity/CMakeLists.txt
index e1774024a5824cc3580273eb16be5e4e0f76e392..4ebcd18f61f4903475d6f42ce22a70b586c2be56 100644 (file)
--- a/source/physics/elasticity/CMakeLists.txt
+++ b/source/physics/elasticity/CMakeLists.txt
@@ -30,5 +30,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/physics/elasticity/*.h
   )
 
-deal_ii_add_library(obj_physics_elasticity OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_physics_elasticity "${_inst}")
+define_object_library(object_physics_elasticity OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_physics_elasticity "${_inst}")

diff --git a/source/sundials/CMakeLists.txt b/source/sundials/CMakeLists.txt
index 06b4d08143a7396beea2208707d4a6b31ae4a038..3c3c5450e62431976cb85422dc84c604ebed9323 100644 (file)
--- a/source/sundials/CMakeLists.txt
+++ b/source/sundials/CMakeLists.txt
@@ -32,5 +32,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/sundials/*.h
   )
 
-deal_ii_add_library(obj_sundials OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_sundials "${_inst}")
+define_object_library(object_sundials OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_sundials "${_inst}")

diff --git a/source/trilinos/CMakeLists.txt b/source/trilinos/CMakeLists.txt
index 021ecd072e1d0c32563e26d89bc23d9902e2a430..06024f482c7059462de9c0dbe3c530694e586d8e 100644 (file)
--- a/source/trilinos/CMakeLists.txt
+++ b/source/trilinos/CMakeLists.txt
@@ -27,5 +27,5 @@ file(GLOB _header
   ${CMAKE_SOURCE_DIR}/include/deal.II/trilinos/*.h
   )
 
-deal_ii_add_library(obj_trilinos OBJECT ${_src} ${_header} ${_inst})
-expand_instantiations(obj_trilinos "${_inst}")
+define_object_library(object_trilinos OBJECT ${_src} ${_header} ${_inst})
+expand_instantiations(object_trilinos "${_inst}")