only modify windows in CMakeLists.txt

This commit is contained in:
krande
2023-11-23 16:05:00 +01:00
parent 1dd8624825
commit b01bd8afb3
2 changed files with 18 additions and 19 deletions
@@ -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
+16 -19
View File
@@ -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()