From 7b18e7c79106a3249a79f8fdfd198591b1aaebff Mon Sep 17 00:00:00 2001 From: pshriwise Date: Fri, 21 Sep 2018 16:22:54 -0400 Subject: [PATCH] Updating travis variables. --- .travis.yml | 2 +- tools/ci/travis-install.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80e9c588a..d2bb6e853 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ env: - OMP=y MPI=n PHDF5=n - OMP=n MPI=y PHDF5=n - OMP=n MPI=y PHDF5=y - - OMP=n MPI=y PHDF5=y CAD=y + - OMP=n MPI=y PHDF5=y DAGMC=y notifications: webhooks: https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN before_install: diff --git a/tools/ci/travis-install.py b/tools/ci/travis-install.py index ce7aa1572..d6720cccf 100644 --- a/tools/ci/travis-install.py +++ b/tools/ci/travis-install.py @@ -21,7 +21,7 @@ def which(program): return None -def install(omp=False, mpi=False, phdf5=False, cad=False): +def install(omp=False, mpi=False, phdf5=False, dagmc=False): # Create build directory and change to it shutil.rmtree('build', ignore_errors=True) os.mkdir('build') @@ -49,9 +49,9 @@ def install(omp=False, mpi=False, phdf5=False, cad=False): else: cmake_cmd.append('-DHDF5_PREFER_PARALLEL=OFF') - if cad: + if dagmc: build_dagmc() - cmake_cmd.append('-Dcad=ON') + cmake_cmd.append('-Ddagmc=ON') # Build and install cmake_cmd.append('..') @@ -132,10 +132,10 @@ def main(): mpi = (os.environ.get('MPI') == 'y') phdf5 = (os.environ.get('PHDF5') == 'y') - cad = (os.environ.get('CAD') == 'y') + dagmc = (os.environ.get('DAGMC') == 'y') # Build and install - install(omp, mpi, phdf5, cad) + install(omp, mpi, phdf5, dagmc) if __name__ == '__main__':