Merge branch 'fix/gmshreader' into 'master'

Fix gmsh reader in MeshCreator

See merge request amdis/amdis-core!237

amdis/MeshCreator.hpp

@@ -24,6 +24,7 @@
 #if HAVE_DUNE_GMSH4
 #include <dune/gmsh4/gmsh4reader.hh>
 #include <dune/gmsh4/gridcreators/lagrangegridcreator.hh>
+#include <dune/gmsh4/utility/version.hh>
 #endif
 
 #include <amdis/AdaptiveGrid.hpp>
@@ -187,9 +188,8 @@ namespace AMDiS
         if (Dune::Gmsh4::fileVersion(filename)[0] >= 4)
           return Dune::Gmsh4Reader<HostGrid, Dune::Gmsh4::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename);
         else
-#else
-        return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
 #endif
+        return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
       }
 #if HAVE_DUNE_VTK
       else if (ext == ".vtu") {