Skip to content

Commit c03753e

Browse files
committed
macOS: remove pre-installed HDF5
1 parent 4749b33 commit c03753e

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ env:
1010
- CIBW_SKIP="cp27-* pp27-*"
1111
# Install dependencies on Linux and OSX
1212
- CIBW_BEFORE_BUILD="bash -x .github/library_builders.sh"
13-
# CMake shall search for static dependencies of HDF5 and ADIOS1
14-
- HDF5_USE_STATIC_LIBRARIES="ON"
15-
- ADIOS_USE_STATIC_LIBS="ON"
1613

1714
jobs:
1815
include:

library_builders.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ CPU_COUNT="${CPU_COUNT:-2}"
99
function install_buildessentials {
1010
if [ -e buildessentials-stamp ]; then return; fi
1111

12+
# Cleanup:
13+
# - Travis-CI macOS ships a pre-installed HDF5
14+
if [ "$(uname -s)" = "Darwin" ]
15+
then
16+
brew unlink hdf5 || true
17+
brew uninstall --ignore-dependencies hdf5 || true
18+
rm -rf /usr/local/Cellar/hdf5
19+
fi
20+
1221
# static libc, tar tool
1322
if [ "$(uname -s)" = "Linux" ]
1423
then
@@ -84,8 +93,11 @@ function build_adios2 {
8493
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
8594
-DADIOS2_BUILD_EXAMPLES=OFF \
8695
-DADIOS2_BUILD_TESTING=OFF \
96+
-DADIOS2_USE_BZip2=OFF \
8797
-DADIOS2_USE_Fortran=OFF \
98+
-DADIOS2_USE_MPI=OFF \
8899
-DADIOS2_USE_PNG=OFF \
100+
-DHDF5_USE_STATIC_LIBRARIES:BOOL=ON \
89101
-DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE \
90102
-DCMAKE_DISABLE_FIND_PACKAGE_BISON=TRUE \
91103
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} ../ADIOS2-*
@@ -138,8 +150,12 @@ function build_hdf5 {
138150
export CFLAGS+=" -fPIC"
139151
export CXXFLAGS+=" -fPIC"
140152

153+
# CMake shall search for static dependencies of HDF5 and ADIOS1
154+
export HDF5_USE_STATIC_LIBRARIES="ON"
155+
export ADIOS_USE_STATIC_LIBS="ON"
156+
141157
install_buildessentials
142158
build_blosc
159+
build_hdf5
143160
build_adios1
144161
build_adios2
145-
build_hdf5

0 commit comments

Comments
 (0)