diff --git a/Docker/Dockerfile b/Docker/Dockerfile index e2850d1..2411b23 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -25,6 +25,19 @@ RUN apt-get update && \ apt-get install -y lsb-release wget software-properties-common gnupg && \ bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" +# Remove any system HDF5 installations to prevent CMake from finding them +RUN apt-get remove -y libhdf5-* hdf5-* || true && \ + apt-get autoremove -y && \ + rm -rf /usr/lib/x86_64-linux-gnu/libhdf5* \ + /usr/lib/x86_64-linux-gnu/hdf5 \ + /usr/lib/aarch64-linux-gnu/libhdf5* \ + /usr/lib/aarch64-linux-gnu/hdf5 \ + /usr/lib/libhdf5* \ + /usr/include/hdf5* \ + /usr/share/hdf5* \ + /usr/local/lib/libhdf5* \ + /usr/local/include/hdf5* || true + # Apply our patches to spack RUN . /opt/setup_spack.sh && \ REPOPATH=${SPACK_ROOT}/var/luxe-spack && \ diff --git a/packages/lxelsim/package.py b/packages/lxelsim/package.py index ccf369c..5420bb1 100644 --- a/packages/lxelsim/package.py +++ b/packages/lxelsim/package.py @@ -8,7 +8,7 @@ class Lxelsim(CMakePackage, Key4hepPackage): git = "https://github.com/LUXEsoftware/lxelsim.git" url = "https://github.com/LUXEsoftware/lxelsim/archive/refs/tags/v00-01.tar.gz" - maintainers = [''] + maintainers = ['madbaron'] version('master', branch='master') @@ -18,7 +18,10 @@ class Lxelsim(CMakePackage, Key4hepPackage): depends_on('hdf5') def cmake_args(self): - args = [] + args = [] args.append(self.define('CMAKE_CXX_STANDARD', '20')) - #args.append(self.define('BUILD_TESTING', self.run_tests)) + + # Set HDF5_ROOT to prevent CMake from picking up system HDF5 + args.append(self.define('HDF5_ROOT', self.spec['hdf5'].prefix)) + return args