Squashed 'modules/rmf/dependency/RMF/' changes from 26aeeb0f8a..643ad…

…763ce 643ad763ce Drop HDF5 version specifier dc27f6810c Work with newer Boost ed01e8af3d Add better description of rmf-dev .deb package git-subtree-dir: modules/rmf/dependency/RMF git-subtree-split: 643ad763ce9466784dbd21baa789171dd32f3056
salilab · Apr 29, 2024 · 234970c · 234970c
1 parent 5dd67dc
commit 234970c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/modules/rmf/dependency/RMF/CMakeLists.txt b/modules/rmf/dependency/RMF/CMakeLists.txt
@@ -54,7 +54,7 @@ find_package(Boost COMPONENTS system filesystem thread program_options iostreams
   REQUIRED)
 
 include(FindHDF5)
-find_package(HDF5 1.8)
+find_package(HDF5)
 
 if("${HDF5_INCLUDE_DIRS}" MATCHES .*NOTFOUND)
 set(RMF_DEPRECATED_BACKENDS 0 CACHE BOOL "Whether to build deprecated backends.")

diff --git a/modules/rmf/dependency/RMF/benchmark/benchmark_rmf.cpp b/modules/rmf/dependency/RMF/benchmark/benchmark_rmf.cpp
@@ -7,6 +7,7 @@
 
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <exception>
 #include <iostream>
 #include <chrono>

diff --git a/modules/rmf/dependency/RMF/src/backend/deprecated_avro/MultipleAvroFileReader.cpp b/modules/rmf/dependency/RMF/src/backend/deprecated_avro/MultipleAvroFileReader.cpp
@@ -7,6 +7,7 @@
  */
 
 #include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/functional/hash/hash.hpp>
 #include <boost/iterator/iterator_facade.hpp>

diff --git a/modules/rmf/dependency/RMF/tools/debian/control b/modules/rmf/dependency/RMF/tools/debian/control
@@ -11,7 +11,7 @@ Package: rmf-dev
 Section: libdevel
 Architecture: any
 Depends: rmf (= ${binary:Version}), ${misc:Depends}, cmake, swig, libboost-filesystem-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-thread-dev, libhdf5-dev, python3-dev, python3-numpy
-Description: Library to support reading and writing of RMF files
+Description: Library to support reading and writing of RMF files - development files
  Headers to compile against RMF.
 
 Package: rmf