From 972fc8e90dfccadf8b73ba47f16959bde99491a7 Mon Sep 17 00:00:00 2001
From: loikki <loic.hausammann@protonmail.ch>
Date: Mon, 5 Aug 2019 13:54:19 +0200
Subject: [PATCH] deal with custom path
---
.gitlab-ci.yml | 1 -
setup.py | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b01830..504fc59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,6 @@ before_script:
- cd ..
# compile pyswiftsim
- - cat swiftsim/Makefile
- python3 setup.py install --with-swift $LHOME/swiftsim --user
# compile the docs
diff --git a/setup.py b/setup.py
index 756f77e..b5a8d0b 100644
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,9 @@ if swift_path:
# hdf5
if "bin" in hdf5_root:
hdf5_root = hdf5_root.split("bin")[0]
- include.append(hdf5_root + "/include")
+
+ if "/usr/lib" in hdf5_root:
+ include.append("/usr/include/hdf5/serial")
# grackle
if parseCmdLine("--with-grackle", store=True):
--
GitLab