diff --git a/.travis.yml b/.travis.yml index b48790d83207078aa633eca9c7599b452c6173c8..e7429211ce476211fb3b10f24d62b0e50fdb7339 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,11 +30,11 @@ matrix: # VALGRIND=yes to make valgrind tests, only when log contains string [valgrind] install: # setup environment to allow install on the home directory - - export PATH="$PATH:$HOME/opt/bin" - - export CPATH="$CPATH:$HOME/opt/include" - - export INCLUDE="$INCLUDE:$HOME/opt/include" - - export LIBRARY_PATH="$LIBRARY_PATH:$HOME/opt/lib" - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/opt/lib" + - export PATH="$HOME/opt/bin:$PATH" + - export CPATH="$HOME/opt/include:$CPATH" + - export INCLUDE="$HOME/opt/include:$INCLUDE" + - export LIBRARY_PATH="$HOME/opt/lib:$LIBRARY_PATH" + - export LD_LIBRARY_PATH="$HOME/opt/lib:$LD_LIBRARY_PATH" # build the manual, only if log contains string [makedoc] - export PLUMED_NUM_THREADS=2 - ./.travis/check.log makedoc || MAKEDOC=no diff --git a/.travis/install.cppcheck b/.travis/install.cppcheck index 0841806f0a818735f7cc95cd994e5edb0065e98c..25543080f983183abe83aa534786eea78af63679 100755 --- a/.travis/install.cppcheck +++ b/.travis/install.cppcheck @@ -16,8 +16,11 @@ else fi -git checkout $tag +git checkout $version make -j 4 install CFGDIR="$HOME/opt/share/cppcheck/" CXXFLAGS="-O2 -march=native -mtune=native -Wunreachable-code" PREFIX="$HOME/opt" cd ../ +cppcheck --version + +