From 4f37ab3f7ef38bee34a9560173abe2801e1f8491 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Fri, 6 Oct 2017 14:53:58 +0200
Subject: [PATCH] fixed missing header, fixed install folder
---
ci/scripts/install.sh | 7 ++++---
src/hysop++/src/fft/fftw3.h | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ci/scripts/install.sh b/ci/scripts/install.sh
index 41f501266..cacae9585 100644
--- a/ci/scripts/install.sh
+++ b/ci/scripts/install.sh
@@ -8,12 +8,12 @@ if [ $# -ne 2 ]; then
fi
if [ ! -d "$1" ]; then
- echo "Folder $1 does not exist."
+ echo "Build folder $1 does not exist."
exit 1
fi
-if [ ! -d "$2" ]; then
- echo "Folder $2 does not exist."
+if [ -d "$2" ]; then
+ echo "Install folder $2 already exists."
exit 1
fi
@@ -21,6 +21,7 @@ BUILD_FOLDER="$1"
INSTALL_FOLDER="$2"
cd $BUILD_FOLDER
+touch $INSTALL_FOLDER
make install
export PYTHONPATH=$INSTALL_FOLDER
python -c 'import hysop; print hysop'
diff --git a/src/hysop++/src/fft/fftw3.h b/src/hysop++/src/fft/fftw3.h
index 56c5c1eac..e71a137c5 100644
--- a/src/hysop++/src/fft/fftw3.h
+++ b/src/hysop++/src/fft/fftw3.h
@@ -3,6 +3,7 @@
#define HYSOP_FFTW3_H
#include <complex>
+#include <stdexcept>
#include <fftw3.h>
#ifdef HAS_QUADMATHS
--
GitLab