From 2e2e676196922918babfbbb7cfc231c652b934eb Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Fri, 10 Jan 2020 12:09:39 +0000 Subject: [PATCH] more CI script tuning --- ci-scripts/install-gsl.sh | 3 +-- ci-scripts/install-nlopt.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci-scripts/install-gsl.sh b/ci-scripts/install-gsl.sh index ddb78b9..ee502fe 100755 --- a/ci-scripts/install-gsl.sh +++ b/ci-scripts/install-gsl.sh @@ -12,8 +12,7 @@ set -ex INITDIR=$(pwd -P) cd ${PREFIX} PREFIX=$(pwd -P) -cd ${INITDIR} -cd local/build +cd ${INITDIR}/local/build wget http://ftpmirror.gnu.org/gsl/${NAME}.tar.gz tar -xzvf ${NAME}.tar.gz mkdir -p ${NAME}/build diff --git a/ci-scripts/install-nlopt.sh b/ci-scripts/install-nlopt.sh index 6f26426..67f9c99 100755 --- a/ci-scripts/install-nlopt.sh +++ b/ci-scripts/install-nlopt.sh @@ -18,10 +18,10 @@ tar -xzvf v${NAME}.tar.gz NAME=nlopt-${NAME} mkdir -p ${NAME}/build cd ${NAME}/build -cmake -DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_INSTALL_PREFIX=${PREFIX} .. +cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} .. make -j4 make install -cmake -DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${PREFIX} .. +cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${PREFIX} .. make -j4 make install cd ${INITDIR}/local