fix build with adios2 v2.11.0 (#4004)

* fix build with adios2 v2.11

The target cxx11_mpi has been renamed to cxx_mpi since adios2 v2.11.

* find adios2 with component MPI

* BUMP adios2 to 2.11.0

* Small tweaks

---------

Co-authored-by: Paul T. Kühner <56360279+schnellerhase@users.noreply.github.com>
Co-authored-by: Jack S. Hale <mail@jackhale.co.uk>

Author: 3 people

cpp/CMakeLists.txt

@@ -377,15 +377,9 @@ set_package_properties(
 # ------------------------------------------------------------------------------
 # Find optional packages
 if(DOLFINX_ENABLE_ADIOS2 AND _REQUIRE_ADIOS2)
-  find_package(ADIOS2 2.8.1 REQUIRED COMPONENTS CXX)
+  find_package(ADIOS2 2.8.1 REQUIRED COMPONENTS CXX MPI)
 elseif(DOLFINX_ENABLE_ADIOS2)
-  find_package(ADIOS2 2.8.1 COMPONENTS CXX)
-endif()
-if(ADIOS2_FOUND AND NOT ADIOS2_HAVE_MPI)
-  message(
-    FATAL_ERROR
-      "Found serial ADIOS2, MPI ADIOS2 build required. Try setting ADIOS2_DIR or ADIOS2_ROOT."
-  )
+  find_package(ADIOS2 2.8.1 COMPONENTS CXX MPI)
 endif()
 
 if(DOLFINX_ENABLE_PETSC)

cpp/dolfinx/CMakeLists.txt

@@ -123,7 +123,17 @@ target_link_libraries(dolfinx PUBLIC hdf5::hdf5)
 # ADIOS2
 if(ADIOS2_FOUND)
   target_compile_definitions(dolfinx PUBLIC HAS_ADIOS2)
-  target_link_libraries(dolfinx PUBLIC adios2::cxx11_mpi)
+  # ADIOS2 2.11 and later
+  if(TARGET adios2::cxx_mpi)
+    set(_adios2_mpi_target adios2::cxx_mpi)
+  # And prior
+  elseif(TARGET adios2::cxx11_mpi)
+    set(_adios2_mpi_target adios2::cxx11_mpi)
+  else()
+    message(FATAL_ERROR
+      "ADIOS2 found, but no adios2::cxx*_mpi target found.")
+  endif()
+  target_link_libraries(dolfinx PUBLIC ${_adios2_mpi_target})
 endif()
 
 # PETSc

docker/Dockerfile.test-env

@@ -12,7 +12,7 @@
 #    docker build --target dev-env --file dolfinx/docker/Dockerfile.test-env --build-arg PETSC_SLEPC_OPTFLAGS="-O2 -march=native" .
 #
 
-ARG ADIOS2_VERSION=2.10.2
+ARG ADIOS2_VERSION=2.11.0
 ARG DOXYGEN_VERSION=1_14_0
 ARG GMSH_VERSION=4_14_0
 ARG HDF5_VERSION=1.14.6