mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-18 14:31:39 +00:00
only modify windows in CMakeLists.txt
This commit is contained in:
@@ -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
|
||||||
|
|||||||
+16
-19
@@ -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,27 +593,23 @@ 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")
|
|
||||||
# macOS
|
|
||||||
list(APPEND HDF5_LIBRARIES
|
|
||||||
"${HDF5_LIBRARY_DIR}/libhdf5_cpp.dylib"
|
|
||||||
"${HDF5_LIBRARY_DIR}/libhdf5.dylib"
|
|
||||||
"${HDF5_LIBRARY_DIR}/libz.dylib"
|
|
||||||
)
|
|
||||||
else()
|
else()
|
||||||
# linux
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
list(APPEND HDF5_LIBRARIES
|
# macOS
|
||||||
"${HDF5_LIBRARY_DIR}/libhdf5_cpp.so"
|
set(zlib_post libz)
|
||||||
"${HDF5_LIBRARY_DIR}/libhdf5.so"
|
set(lib_ext dylib)
|
||||||
"${HDF5_LIBRARY_DIR}/libz.so"
|
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()
|
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()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user