Skip to content
Snippets Groups Projects
Commit 1613c273 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.2' into v2.3

parents 4b45ea62 9ce13869
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
.travis.yml
+ 2
− 0
View file @ 1613c273
......@@ -42,9 +42,11 @@ matrix:
env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3 LAPACK=yes CONFIG_FLAGS="--disable-external-lapack"
# osx serial
- os: osx
osx_image: xcode7.3
env: PLUMED_CC=clang PLUMED_CXX=clang++ PLUMED_CXXFLAGS=-O3
# osx parallel
- os: osx
osx_image: xcode7.3
env: PLUMED_CC=mpicc PLUMED_CXX=mpic++ PLUMED_CXXFLAGS=-O3
# osx serial macports
- os: osx
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment