make modifications to support conda hdf5 1.14 in CMakeLists.txt

.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

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)
+                find_package(HDF5 COMPONENTS CXX)
-                set(lib_ext lib)
+                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)
+                list(APPEND HDF5_LIBRARIES
-                set(lib_ext dylib)
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.dylib"
+                    "${HDF5_LIBRARY_DIR}/libhdf5.dylib"
+                    "${HDF5_LIBRARY_DIR}/libz.dylib"
+                )
             else()
                 # linux
-                set(zlib_post libz)
+                list(APPEND HDF5_LIBRARIES
-                set(lib_ext so)
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.so"
+                    "${HDF5_LIBRARY_DIR}/libhdf5.so"
+                    "${HDF5_LIBRARY_DIR}/libz.so"
+                )
             endif()
 
             set(HDF5_LIBRARIES

conda/meta.yaml

@@ -32,8 +32,7 @@ requirements:
     - occt 7.7.2 *{{ variant }}*
     - libxml2
     - cgal-cpp
-    - hdf5 1.12 # [win]
+    - hdf5
-    - hdf5 # [not win]
     - mpfr
     - gmp  # [unix]
     - mpir  # [win]