From 30925a4b3c0ebfbc391758cf0775f21ffdf4d2c3 Mon Sep 17 00:00:00 2001 From: Esteban DUGUEPEROUX Date: Thu, 9 Oct 2025 22:18:36 +0200 Subject: [PATCH] fix format --- .github/workflows/ci-ifcopenshell-docker.yml | 1 + .github/workflows/ci.yml | 7 ------- .github/workflows/release.yml | 1 + cmake/CMakePresets.json | 2 ++ conda/build.bat | 2 ++ conda/build.sh | 2 ++ 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-ifcopenshell-docker.yml b/.github/workflows/ci-ifcopenshell-docker.yml index f4291b799e..cdc2e173b4 100644 --- a/.github/workflows/ci-ifcopenshell-docker.yml +++ b/.github/workflows/ci-ifcopenshell-docker.yml @@ -63,6 +63,7 @@ jobs: -DMPFR_INCLUDE_DIR=/usr/include \ -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \ -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \ + -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \ -DGLTF_SUPPORT=On \ -DJSON_INCLUDE_DIR=/usr/include \ -DEIGEN_DIR=/usr/include/eigen3 \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 486e244eb2..4db5284ab1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,13 +118,6 @@ jobs: -DUSE_MMAP=On \ "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \ -DGLTF_SUPPORT=On \ - -DJSON_INCLUDE_DIR=/usr/include \ - -DCGAL_INCLUDE_DIR=/usr/include \ - -DGMP_INCLUDE_DIR=/usr/include \ - -DMPFR_INCLUDE_DIR=/usr/include \ - -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \ - -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \ - -DEIGEN_DIR=/usr/include/eigen3 \ -DWITH_ROCKSDB=On \ ../cmake sudo make -j $(nproc) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 94e2dac4f9..93ecaf11d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,6 +65,7 @@ jobs: -DMPFR_INCLUDE_DIR=/usr/include \ -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \ -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \ + -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \ -DOPENCOLLADA_INCLUDE_DIR=/usr/include/opencollada \ -DOPENCOLLADA_LIBRARY_DIR=/usr/lib/opencollada/ \ ../cmake diff --git a/cmake/CMakePresets.json b/cmake/CMakePresets.json index bef211b735..9c10495ad3 100644 --- a/cmake/CMakePresets.json +++ b/cmake/CMakePresets.json @@ -51,6 +51,8 @@ "MPFR_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib", "Boost_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib", "Boost_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include", + "HDF5_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include", + "HDF5_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib", "ZLIB_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include" } }, diff --git a/conda/build.bat b/conda/build.bat index 6403ab0f21..388e5cd746 100644 --- a/conda/build.bat +++ b/conda/build.bat @@ -24,6 +24,8 @@ cmake -G "Ninja" ^ -D MPFR_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^ -D COLLADA_SUPPORT=OFF ^ -D HDF5_SUPPORT=ON ^ + -D HDF5_INCLUDE_DIR="%LIBRARY_PREFIX%\include" ^ + -D HDF5_LIBRARY_DIR="%LIBRARY_PREFIX%\lib" ^ -D JSON_INCLUDE_DIR="%LIBRARY_PREFIX%\include" ^ -D PYTHON_INCLUDE_DIR=%PREFIX%\include ^ -D PYTHON_EXECUTABLE:FILEPATH=%PREFIX%\python.exe ^ diff --git a/conda/build.sh b/conda/build.sh index 9722e1eb01..b17bc87159 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -26,6 +26,8 @@ cmake ${CMAKE_ARGS} -G Ninja \ -DOCC_INCLUDE_DIR=$PREFIX/include/opencascade \ -DOCC_LIBRARY_DIR=$PREFIX/lib \ -DHDF5_SUPPORT:BOOL=ON \ + -DHDF5_INCLUDE_DIR=$PREFIX/include \ + -DHDF5_LIBRARY_DIR=$PREFIX/lib \ -DJSON_INCLUDE_DIR=$PREFIX/include \ -DCGAL_INCLUDE_DIR=$PREFIX/include \ -DLIBXML2_INCLUDE_DIR=$PREFIX/include/libxml2 \