use manually installed MacOSX SDK on github runner. Minor rewrite of dynamic/static zlib conditional for conda_build.

This commit is contained in:
krande
2022-04-11 13:45:12 +02:00
parent 84587e722b
commit 549812c51c
3 changed files with 27 additions and 7 deletions
+6
View File
@@ -31,6 +31,12 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Download MacOSX SDK
run: |
curl -o MacOSX10.13.sdk.tar.xz -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz.tar.xz && \
tar xf MacOSX10.13.sdk.tar.xz && \
sudo mv -v MacOSX10.13.sdk /opt/ && \
ls /opt/
- uses: seanmiddleditch/gha-setup-ninja@master
- uses: conda-incubator/setup-miniconda@v2 # https://github.com/conda-incubator/setup-miniconda
with:
+20 -6
View File
@@ -441,7 +441,8 @@ if(HDF5_SUPPORT)
if (HDF5_LIBRARY_DIR)
# result of the HDF5 ctest package
# Find zlib using cmake find_library. How should this be implemented?
# FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH)
if (WIN32)
# Windows
@@ -457,12 +458,25 @@ if(HDF5_SUPPORT)
set(lib_ext so)
endif()
if ("$ENV{CONDA_BUILD}" STREQUAL "")
if (WIN32)
# Should we use dynamic dll for windows also?
#set(lib_ext dll)
else()
set(lib_ext a)
endif()
endif()
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(debug_postfix "_debug")
endif()
SET(HDF5_LIBRARIES
"${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
"${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
"${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
# "${HDF5_LIBRARY_DIR}/libsz.${lib_ext}"
# "${HDF5_LIBRARY_DIR}/libaec.${lib_ext}"
"${HDF5_LIBRARY_DIR}/libhdf5_cpp${debug_postfix}.${lib_ext}"
"${HDF5_LIBRARY_DIR}/libhdf5${debug_postfix}.${lib_ext}"
"${HDF5_LIBRARY_DIR}/${zlib_post}${debug_postfix}.${lib_ext}"
# "${HDF5_LIBRARY_DIR}/libsz${debug_postfix}.${lib_ext}"
# "${HDF5_LIBRARY_DIR}/libaec${debug_postfix}.${lib_ext}"
)
endif()
+1 -1
View File
@@ -1,2 +1,2 @@
CONDA_BUILD_SYSROOT:
- /Applications/Xcode_13.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk # [osx]
- /opt/MacOSX10.13.sdk # [osx]