From c0ce8c7d4556c69efc1deec18164115ba404accc Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Thu, 1 Jun 2017 10:33:19 -0400
Subject: [PATCH] ADIOS1: Enable compatibility with 1.10.0 adios_declare_group
signature
---
examples/heatTransfer/write/IO_adios1.cpp | 5 +++++
source/adios2/CMakeLists.txt | 3 +++
source/adios2/engine/adios1/ADIOS1Writer.cpp | 5 +++++
3 files changed, 13 insertions(+)
diff --git a/examples/heatTransfer/write/IO_adios1.cpp b/examples/heatTransfer/write/IO_adios1.cpp
index 898691a1d..95e0be201 100644
--- a/examples/heatTransfer/write/IO_adios1.cpp
+++ b/examples/heatTransfer/write/IO_adios1.cpp
@@ -16,6 +16,11 @@
#include <adios.h>
+// Enable compatibility with ADIOS 1.10 adios_declare_group signature
+#if !ADIOS_VERSION_GE(1, 11, 0)
+#define adios_stat_default adios_flag_yes
+#endif
+
static int64_t group;
static int rank_saved;
diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
index 98e2c4ac2..2d19f4076 100644
--- a/source/adios2/CMakeLists.txt
+++ b/source/adios2/CMakeLists.txt
@@ -102,6 +102,9 @@ if(ADIOS_USE_HDF5)
"of ADIOS is being built, which requires a sequential HDF5."
)
endif()
+ message("DEBUG: HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}")
+ message("DEBUG: HDF5_C_INCLUDE_DIRS: ${HDF5_C_INCLUDE_DIRS}")
+ message("DEBUG: HDF5_C_LIBRARIES: ${HDF5_C_LIBRARIES}")
target_include_directories(adios2 PRIVATE ${HDF5_C_INCLUDE_DIRS})
target_sources(adios2 PRIVATE
engine/hdf5/HDF5ReaderP.cpp
diff --git a/source/adios2/engine/adios1/ADIOS1Writer.cpp b/source/adios2/engine/adios1/ADIOS1Writer.cpp
index 815aa895b..71a6d5485 100644
--- a/source/adios2/engine/adios1/ADIOS1Writer.cpp
+++ b/source/adios2/engine/adios1/ADIOS1Writer.cpp
@@ -17,6 +17,11 @@
extern int adios_verbose_level;
extern int adios_errno;
+// Enable compatibility with ADIOS 1.10 adios_declare_group signature
+#if !ADIOS_VERSION_GE(1, 11, 0)
+#define adios_stat_default adios_flag_yes
+#endif
+
namespace adios
{
--
GitLab