Fix include issues with examples

examples/heatTransfer/write/CMakeLists.txt

@@ -34,4 +34,22 @@ if(ADIOS_USE_MPI)
       adios1::adios ${MPI_C_LIBRARIES}
     )
   endif()
+
+  if(ADIOS_USE_HDF5)
+    find_package(HDF5 REQUIRED)
+    find_package(MPI COMPONENTS C REQUIRED)
+
+    add_executable(heatTransfer_write_hdf5
+      main.cpp
+      HeatTransfer.cpp
+      Settings.cpp
+      IO_hdf5_a.cpp
+    )
+    target_include_directories(heatTransfer_write_hdf5
+      PRIVATE ${MPI_C_INCLUDE_PATH} ${HDF5_INCLUDE_DIRS}
+    )
+    target_link_libraries(heatTransfer_write_hdf5
+      ${MPI_C_LIBRARIES} ${HDF5_C_LIBRARIES}
+    )
+  endif()
 endif()

examples/heatTransfer/write/HeatTransfer.cpp

@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "adios2/HeatTransfer.h"
+#include "HeatTransfer.h"
 
 HeatTransfer::HeatTransfer(const Settings &settings) : m_s{settings}
 {

examples/heatTransfer/write/HeatTransfer.h

@@ -15,7 +15,7 @@
 
 #include <vector>
 
-#include "adios2/Settings.h"
+#include "Settings.h"
 
 class HeatTransfer
 {

examples/heatTransfer/write/IO.h

@@ -11,8 +11,8 @@
 #ifndef IO_H_
 #define IO_H_
 
-#include "adios2/HeatTransfer.h"
-#include "adios2/Settings.h"
+#include "HeatTransfer.h"
+#include "Settings.h"
 
 #include <mpi.h>
 

examples/heatTransfer/write/IO_adios1.cpp

@@ -8,12 +8,13 @@
  *      Author: Norbert Podhorszki
  */
 
+#include "IO.h"
+
 #include <iomanip>
 #include <iostream>
 #include <string>
 
-#include "adios2/IO.h"
-#include "adios2/adios.h"
+#include <adios.h>
 
 static int64_t group;
 static int rank_saved;

examples/heatTransfer/write/IO_adios2.cpp

@@ -8,11 +8,12 @@
  *      Author: Norbert Podhorszki
  */
 
-#include "adios2/IO.h"
-#include <adios2.h>
+#include "IO.h"
 
 #include <string>
 
+#include <adios2.h>
+
 static int rank_saved;
 adios::ADIOS *ad = nullptr;
 std::shared_ptr<adios::Engine> bpWriter;

examples/heatTransfer/write/IO_ascii.cpp

@@ -8,12 +8,12 @@
  *      Author: Norbert Podhorszki
  */
 
+#include "IO.h"
+
 #include <fstream>
 #include <iomanip>
 #include <iostream>
 
-#include "adios2/IO.h"
-
 static std::ofstream of;
 static std::streambuf *buf;
 

examples/heatTransfer/write/IO_hdf5_a.cpp

@@ -11,13 +11,14 @@
  *      Author: Norbert Podhorszki
  */
 
+#include "IO.h"
+
 #include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <string>
 
-#include "adios2/IO.h"
-#include "adios2/hdf5.h"
+#include <hdf5.h>
 
 IO::IO(const Settings &s, MPI_Comm comm) : m_outputfilename{s.outputfile} {}
 

examples/heatTransfer/write/Settings.cpp

@@ -8,12 +8,13 @@
  *      Author: Norbert Podhorszki
  */
 
-#include <cstdlib>
+#include "Settings.h"
+
 #include <errno.h>
 
-#include <stdexcept>
+#include <cstdlib>
 
-#include "adios2/Settings.h"
+#include <stdexcept>
 
 static unsigned int convertToUint(std::string varName, char *arg)
 {

examples/heatTransfer/write/main.cpp

@@ -17,9 +17,9 @@
 #include <stdexcept>
 #include <string>
 
-#include "adios2/HeatTransfer.h"
-#include "adios2/IO.h"
-#include "adios2/Settings.h"
+#include "HeatTransfer.h"
+#include "IO.h"
+#include "Settings.h"
 
 void printUsage()
 {