From 545d193277c3d85ad4a54e90c841347155f75c7c Mon Sep 17 00:00:00 2001 From: Victor Popov Date: Fri, 22 May 2020 12:38:15 +0300 Subject: [PATCH] [pybindings] fix paths if omim-builddir is a relative path --- pyhelpers/setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pyhelpers/setup.py b/pyhelpers/setup.py index be1b6f77c1..282feb2b91 100644 --- a/pyhelpers/setup.py +++ b/pyhelpers/setup.py @@ -130,6 +130,7 @@ PYHELPERS_DIR = os.path.abspath(os.path.dirname(__file__)) OMIM_ROOT = os.path.dirname(PYHELPERS_DIR) BOOST_ROOT = os.path.join(OMIM_ROOT, '3party', 'boost') BOOST_LIBRARYDIR = os.path.join(BOOST_ROOT, 'stage', 'lib') +ORIGINAL_CWD = os.getcwd() def python_static_libdir(): @@ -171,10 +172,15 @@ class BuildCommand(build, object): self.omim_builddir = os.path.join(OMIM_ROOT, 'build') def finalize_options(self): + if os.path.isabs(self.omim_builddir): + self.omim_builddir = os.path.abspath(self.omim_builddir) + else: + self.omim_builddir = os.path.abspath( + os.path.join(ORIGINAL_CWD, self.omim_builddir) + ) self.build_base = os.path.relpath( os.path.join(self.omim_builddir, 'pybindings-builddir') ) - self.omim_builddir = os.path.abspath(self.omim_builddir) super(BuildCommand, self).finalize_options()