Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 13:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

only modify windows in CMakeLists.txt

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-ifcopenshell-conda-daily.yml
+2
View File
@@ -51,6 +51,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Download MacOSX SDK - name: Download MacOSX SDK
if: ${{ matrix.platform.name == 'macOS' }} if: ${{ matrix.platform.name == 'macOS' }}
run: | run: |
@@ -58,6 +59,7 @@ jobs:
tar xf MacOSX10.13.sdk.tar.xz && \ tar xf MacOSX10.13.sdk.tar.xz && \
sudo mv -v MacOSX10.13.sdk /opt/ && \ sudo mv -v MacOSX10.13.sdk /opt/ && \
ls /opt/ ls /opt/
- uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
with: with:
environment-name: build-env environment-name: build-env
cmake/CMakeLists.txt
+9 -12
View File
@@ -582,9 +582,10 @@ if(HDF5_SUPPORT)
else() else()
message(STATUS "Packaging hdf5 and zlib for conda distribution") message(STATUS "Packaging hdf5 and zlib for conda distribution")
set(HDF5_LIBRARIES)
if(WIN32) if(WIN32)
# Windows # Windows
set(HDF5_LIBRARIES)
find_package(HDF5 COMPONENTS CXX) find_package(HDF5 COMPONENTS CXX)
if (HDF5_FOUND) if (HDF5_FOUND)
set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES}) set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES})
@@ -592,20 +593,15 @@ if(HDF5_SUPPORT)
list(APPEND HDF5_LIBRARIES list(APPEND HDF5_LIBRARIES
"${HDF5_LIBRARY_DIR}/zlib.lib" "${HDF5_LIBRARY_DIR}/zlib.lib"
) )
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") else()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# macOS # macOS
list(APPEND HDF5_LIBRARIES set(zlib_post libz)
"${HDF5_LIBRARY_DIR}/libhdf5_cpp.dylib" set(lib_ext dylib)
"${HDF5_LIBRARY_DIR}/libhdf5.dylib"
"${HDF5_LIBRARY_DIR}/libz.dylib"
)
else() else()
# linux # linux
list(APPEND HDF5_LIBRARIES set(zlib_post libz)
"${HDF5_LIBRARY_DIR}/libhdf5_cpp.so" set(lib_ext so)
"${HDF5_LIBRARY_DIR}/libhdf5.so"
"${HDF5_LIBRARY_DIR}/libz.so"
)
endif() endif()
set(HDF5_LIBRARIES set(HDF5_LIBRARIES
@@ -615,6 +611,7 @@ if(HDF5_SUPPORT)
) )
endif() endif()
endif() endif()
endif()
if(NOT HDF5_LIBRARIES) if(NOT HDF5_LIBRARIES)
# debian default # debian default