From b4c52d76d04c05d74d8c282e1247ca578a5c2edd Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Sun, 28 Feb 2016 19:32:18 +0100
Subject: [PATCH] Upgraded doxygen to 1.8.11

[makedoc]
---
 .travis.yml             | 4 ++--
 .travis/install.doxygen | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aef80d697..c64de44c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,7 +72,7 @@ install:
 # install doxygen-latex
   - if test "$MAKEDOC" == yes ; then sudo apt-get install -y doxygen-latex ; fi
 # then replace doxygen with the desided version
-  - if test "$MAKEDOC" == yes ; then ./.travis/install.doxygen Release_1_8_7 ; fi
+  - if test "$MAKEDOC" == yes ; then ./.travis/install.doxygen Release_1_8_11 ; fi
   - if test "$VALGRIND" == yes ; then sudo apt-get install -y valgrind           ; fi
   - if test "$LAPACK" == yes ; then sudo apt-get -y install libatlas-base-dev      ; fi
   - if test "$ALMOST" == yes ; then sudo apt-get -y install libatlas-base-dev      ; fi
@@ -90,7 +90,7 @@ script:
 # this is done only if PLUMED_CXX is defined
 # we have to pass the full path since on travis machines sudo does not have compilers in the path
   - if test "$PLUMED_CXX" ; then ./configure CXX=$(which $PLUMED_CXX) CC=$(which $PLUMED_CC) CXXFLAGS="$PLUMED_CXXFLAGS" LDFLAGS="$PLUMED_LDFLAGS" CPPFLAGS="$PLUMED_CPPFLAGS" $ENALMOST $CONFIG_FLAGS ; fi
-  - if test "$PLUMED_CXX" ; then make -j 2 ; fi
+  - if test "$PLUMED_CXX" ; then make -j 4 ; fi
 # we install plumed so that it is in the path
   - if test "$PLUMED_CXX" ; then make install prefix="$HOME/opt" ; fi
 
diff --git a/.travis/install.doxygen b/.travis/install.doxygen
index 79b0ab2d8..7a425f33d 100755
--- a/.travis/install.doxygen
+++ b/.travis/install.doxygen
@@ -17,8 +17,11 @@ fi
 
 git checkout $version
 
-./configure --prefix="$HOME/opt"
-make
+mkdir build
+cd build
+cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$HOME/opt" ../
+make -j 4
 make install
+
 cd ../
 
-- 
GitLab