diff --git a/.github/workflows/ci-ifcopenshell-conda-daily.yml b/.github/workflows/ci-ifcopenshell-conda-daily.yml index 51bfa1cc57..8ed8a67275 100644 --- a/.github/workflows/ci-ifcopenshell-conda-daily.yml +++ b/.github/workflows/ci-ifcopenshell-conda-daily.yml @@ -2,10 +2,6 @@ name: ci-ifcopenshell-conda-daily on: workflow_dispatch: - push: - paths: - - .github/workflows/ci-ifcopenshell-conda-daily.yml - - conda/** schedule: # ┌───────────── minute (0 - 59) # │ ┌───────────── hour (0 - 23) @@ -19,7 +15,7 @@ jobs: activate: runs-on: ubuntu-latest if: | - github.repository == 'IfcOpenShell/IfcOpenShell' + github.repository == 'Krande/IfcOpenShell' steps: - name: Set env run: echo ok go diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 6d8fac006e..08fb022088 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -582,19 +582,30 @@ if(HDF5_SUPPORT) else() message(STATUS "Packaging hdf5 and zlib for conda distribution") - + set(HDF5_LIBRARIES) if(WIN32) # Windows - set(zlib_post zlib) - set(lib_ext lib) + find_package(HDF5 COMPONENTS CXX) + if (HDF5_FOUND) + set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES}) + endif() + list(APPEND HDF5_LIBRARIES + "${HDF5_LIBRARY_DIR}/zlib.lib" + ) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # macOS - set(zlib_post libz) - set(lib_ext dylib) + list(APPEND HDF5_LIBRARIES + "${HDF5_LIBRARY_DIR}/libhdf5_cpp.dylib" + "${HDF5_LIBRARY_DIR}/libhdf5.dylib" + "${HDF5_LIBRARY_DIR}/libz.dylib" + ) else() # linux - set(zlib_post libz) - set(lib_ext so) + list(APPEND HDF5_LIBRARIES + "${HDF5_LIBRARY_DIR}/libhdf5_cpp.so" + "${HDF5_LIBRARY_DIR}/libhdf5.so" + "${HDF5_LIBRARY_DIR}/libz.so" + ) endif() set(HDF5_LIBRARIES diff --git a/conda/meta.yaml b/conda/meta.yaml index 2b1bc99376..7b9d6b51b0 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -32,8 +32,7 @@ requirements: - occt 7.7.2 *{{ variant }}* - libxml2 - cgal-cpp - - hdf5 1.12 # [win] - - hdf5 # [not win] + - hdf5 - mpfr - gmp # [unix] - mpir # [win]