From dd2415d35065019d3b1be232dd2babe0b1eb44ce Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 29 Jan 2018 15:26:29 -0600 Subject: [PATCH] Make sure non-PHDF5 builds turn off prefer_parallel --- tools/ci/travis-install.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/ci/travis-install.py b/tools/ci/travis-install.py index 0e4dbdc01..8fda09b09 100644 --- a/tools/ci/travis-install.py +++ b/tools/ci/travis-install.py @@ -42,13 +42,16 @@ def install(omp=False, mpi=False, phdf5=False): if not mpi: raise ValueError('Parallel HDF5 must be used in ' 'conjunction with MPI.') - cmake_cmd.append('-DHDF5_PREFER_PARALLEL=on') + cmake_cmd.append('-DHDF5_PREFER_PARALLEL=ON') + else: + cmake_cmd.append('-DHDF5_PREFER_PARALLEL=OFF') # Build and install cmake_cmd.append('..') + print(' '.join(cmake_cmd)) subprocess.call(cmake_cmd) subprocess.call(['make', '-j']) - subprocess.call(['make', 'install']) + subprocess.call(['sudo', 'make', 'install']) def main():