From b01bd8afb3bd3bc9b52a8471f52fa65c3c5dfc96 Mon Sep 17 00:00:00 2001
From: krande <kristoffer_andersen@outlook.com>
Date: Thu, 23 Nov 2023 16:05:00 +0100
Subject: [PATCH] only modify windows in CMakeLists.txt

---
 .../workflows/ci-ifcopenshell-conda-daily.yml |  2 ++
 cmake/CMakeLists.txt                          | 35 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci-ifcopenshell-conda-daily.yml b/.github/workflows/ci-ifcopenshell-conda-daily.yml
index 48917b3d69..6d43cae605 100644
--- a/.github/workflows/ci-ifcopenshell-conda-daily.yml
+++ b/.github/workflows/ci-ifcopenshell-conda-daily.yml
@@ -51,6 +51,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
+
       - name: Download MacOSX SDK
         if: ${{ matrix.platform.name == 'macOS' }}
         run: |
@@ -58,6 +59,7 @@ jobs:
           tar xf MacOSX10.13.sdk.tar.xz && \
           sudo mv -v MacOSX10.13.sdk /opt/ && \
           ls /opt/
+
       - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
         with:
           environment-name: build-env
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 08fb022088..c44f9ddc77 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -582,9 +582,10 @@ if(HDF5_SUPPORT)
 
         else()
             message(STATUS "Packaging hdf5 and zlib for conda distribution")
-            set(HDF5_LIBRARIES)
+
             if(WIN32)
                 # Windows
+                set(HDF5_LIBRARIES)
                 find_package(HDF5 COMPONENTS CXX)
                 if (HDF5_FOUND)
                     set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES})
@@ -592,27 +593,23 @@ if(HDF5_SUPPORT)
                 list(APPEND HDF5_LIBRARIES
                     "${HDF5_LIBRARY_DIR}/zlib.lib"
                 )
-            elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-                # macOS
-                list(APPEND HDF5_LIBRARIES
-                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.dylib"
-                    "${HDF5_LIBRARY_DIR}/libhdf5.dylib"
-                    "${HDF5_LIBRARY_DIR}/libz.dylib"
-                )
             else()
-                # linux
-                list(APPEND HDF5_LIBRARIES
-                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.so"
-                    "${HDF5_LIBRARY_DIR}/libhdf5.so"
-                    "${HDF5_LIBRARY_DIR}/libz.so"
+                if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+                    # macOS
+                    set(zlib_post libz)
+                    set(lib_ext dylib)
+                else()
+                    # linux
+                    set(zlib_post libz)
+                    set(lib_ext so)
+                endif()
+
+                set(HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
                 )
             endif()
-
-            set(HDF5_LIBRARIES
-                "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
-            )
         endif()
     endif()