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

Merge branch 'v2.3' into v2.4

parents 00a3e6d0 2f28a389
No related branches found
No related tags found
No related merge requests found
...@@ -112,6 +112,9 @@ install: ...@@ -112,6 +112,9 @@ install:
# install some package - these are fast, we install them anyway # install some package - these are fast, we install them anyway
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libmatheval-dev libfftw3-dev gsl-bin libgsl0-dev libboost-serialization-dev ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libmatheval-dev libfftw3-dev gsl-bin libgsl0-dev libboost-serialization-dev ; fi
- if test "$PLUMED_CXX" ; then ./.travis/install.xdrfile ; fi - if test "$PLUMED_CXX" ; then ./.travis/install.xdrfile ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
./.travis/install.ccache v3.4.2 ;
fi
# cppcheck: # cppcheck:
# I use 1.71 since 1.72 seems to report a lot of false positive # I use 1.71 since 1.72 seems to report a lot of false positive
- if test "$CPPCHECK" == yes ; then ./.travis/install.cppcheck $CPPCHECK_VERSION ; fi - if test "$CPPCHECK" == yes ; then ./.travis/install.cppcheck $CPPCHECK_VERSION ; fi
......
#! /bin/bash
set -e
set -x
cd "$(mktemp -dt plumed.XXXXXX)"
git clone https://github.com/ccache/ccache.git
cd ccache
if [ -n "$1" ] ; then
echo "installing ccache $version"
version=$1
else
echo "installing latest ccache"
version=$(git tag | tail -n 1)
fi
git checkout $version
./autogen.sh
./configure --prefix="$HOME/opt"
make -j 4
# full install does not work as it required asciidoc installed:
# make install
mkdir -p "$HOME/opt/bin"
cp ccache $HOME/opt/bin/
...@@ -239,4 +239,5 @@ For developers: ...@@ -239,4 +239,5 @@ For developers:
- `plumed patch -e` now accepts a name closely matching the patch name (e.g. `plumed patch -e gromacs2016.5` will try to patch - `plumed patch -e` now accepts a name closely matching the patch name (e.g. `plumed patch -e gromacs2016.5` will try to patch
even if the stored patch is for `gromacs-2016.4`). This simplifies managing Portfiles. Nothing changes when picking the patch even if the stored patch is for `gromacs-2016.4`). This simplifies managing Portfiles. Nothing changes when picking the patch
from the interactive menu. from the interactive menu.
- Install newer ccache on travis-ci, build faster.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment