From ec5e6c6920017ef4799c74c6713e5551be407b48 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Thu, 28 Nov 2019 12:30:17 +0000
Subject: [PATCH] build system update

---
 .travis.yml                 | 2 +-
 ci-scripts/install-gsl.sh   | 2 +-
 ci-scripts/install-hdf5.sh  | 2 +-
 ci-scripts/install-nlopt.sh | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35d0f5e..dba6897 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export PATH="${LATDIR}/ci-scripts/clang/bin:${PATH}"; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export LD_LIBRARY_PATH="${LATDIR}/ci-scripts/clang/lib:${LD_LIBRARY_PATH}"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex cmake; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc@${VERSION#-}; fi
   
 install:
diff --git a/ci-scripts/install-gsl.sh b/ci-scripts/install-gsl.sh
index 317a023..288b5bc 100755
--- a/ci-scripts/install-gsl.sh
+++ b/ci-scripts/install-gsl.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-NAME='gsl-2.5'
+NAME='gsl-2.6'
 
 if (( $# != 1 )); then
   echo "usage: `basename $0` <prefix>" 1>&2
diff --git a/ci-scripts/install-hdf5.sh b/ci-scripts/install-hdf5.sh
index ca2ee9e..98867dd 100755
--- a/ci-scripts/install-hdf5.sh
+++ b/ci-scripts/install-hdf5.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-NAME='hdf5-1.10.1'
+NAME='hdf5-1.10.5'
 
 if (( $# != 1 )); then
   echo "usage: `basename $0` <prefix>" 1>&2
diff --git a/ci-scripts/install-nlopt.sh b/ci-scripts/install-nlopt.sh
index ba8fe98..db97c5d 100755
--- a/ci-scripts/install-nlopt.sh
+++ b/ci-scripts/install-nlopt.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-NAME='nlopt-2.4.2'
+NAME='2.6.1'
 
 if (( $# != 1 )); then
   echo "usage: `basename $0` <prefix>" 1>&2
@@ -11,11 +11,12 @@ PREFIX=$1
 set -ex
 INITDIR=`pwd`
 cd local/build
-wget http://ab-initio.mit.edu/nlopt/${NAME}.tar.gz
-tar -xzvf ${NAME}.tar.gz
+wget https://github.com/stevengj/nlopt/archive/v${NAME}.tar.gz
+tar -xzvf v${NAME}.tar.gz
+NAME=nlopt-${NAME}
 mkdir -p ${NAME}/build
 cd ${NAME}/build
-../configure --prefix=${PREFIX} --with-cxx --without-guile --without-python --without-octave --without-matlab --with-pic
+cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} ..
 make -j4 
 make install
 cd ${INITDIR}/local