From a06b9f4267a86f39bf6dc0b134447ae8bf26d54b Mon Sep 17 00:00:00 2001 From: Mavo Date: Fri, 20 May 2016 18:51:56 +0200 Subject: [PATCH] Removed hard coded path Former-commit-id: d18bc5a7519dd22821e7c273b091028172648dd9 --- stormpy/setup.cfg | 1 + stormpy/setup.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stormpy/setup.cfg b/stormpy/setup.cfg index 93d2dc675..ce16455c6 100644 --- a/stormpy/setup.cfg +++ b/stormpy/setup.cfg @@ -1,2 +1,3 @@ [build_ext] use-cln=0 +carl_src=../../carl/src/ diff --git a/stormpy/setup.py b/stormpy/setup.py index 72bb6b628..bd9102fa2 100755 --- a/stormpy/setup.py +++ b/stormpy/setup.py @@ -20,8 +20,6 @@ include_dirs = ['.', 'src', 'resources/pybind11/include/'] # Add more include dirs # TODO handle by cmake include_dirs.extend(['../build/include/', '../resources/3rdparty/sylvan/src/', '../resources/3rdparty/exprtk/', '../resources/3rdparty/gmm-5.0/include/']) -carl_dir = "/Users/mvolk/develop/carl/src/" -include_dirs.append(carl_dir) boost_dir = '/usr/local/include/' include_dirs.append(boost_dir) cudd_dirs = ['../resources/3rdparty/cudd-3.0.0/cplusplus/', '../resources/3rdparty/cudd-3.0.0/mtr/', '../resources/3rdparty/cudd-3.0.0/cudd/'] @@ -96,7 +94,10 @@ class stormpy_build_ext(build_ext): """ user_options = build_ext.user_options + [ ('use-cln', None, - "use cln numbers instead of gmpxx") + "use cln numbers instead of gmpxx"), + ('carl_src', None, + "path to src directory of CaRL"), + ] def __init__(self, *args, **kwargs): @@ -105,6 +106,7 @@ class stormpy_build_ext(build_ext): def initialize_options (self): build_ext.initialize_options(self) self.use_cln = None + self.carl_src = None def finalize_options(self): build_ext.finalize_options(self) @@ -126,6 +128,9 @@ class stormpy_build_ext(build_ext): # Makes local storm library lookup that much easier self.rpath += library_dirs + print("Add carl_src: {}".format(self.carl_src)) + include_dirs.append(self.carl_src) + setup(name="stormpy", version="0.9", author="M. Volk",