Merge branch 'master' of bitbucket.org:glavaux/cosmotool

src/CMakeLists.txt

@@ -41,7 +41,7 @@ if (HDF5_FOUND)
   set_property(TARGET CosmoHDF5 PROPERTY POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
   target_include_directories(CosmoHDF5 BEFORE PRIVATE ${HDF5_INCLUDE_DIR})
 else(HDF5_FOUND)
-  add_library(CosmoHdf5  OBJECT
+  add_library(CosmoHDF5  OBJECT
     loadFlash_dummy.cpp
   )
 endif (HDF5_FOUND)

src/hdf5_array.hpp

@@ -51,7 +51,7 @@ knowledge of the CeCILL license and that you accept its terms.
 #include <H5Cpp.h>
 
 namespace CosmoTool {
-#if (H5_VERS_MAJOR == 1) && (H5_VERS_MINOR <= 8)
+#if H5_VERSION_GE(1,8,20)
   typedef H5::CommonFG H5_CommonFileGroup;
 #else
   typedef H5::Group H5_CommonFileGroup;