From b3b00fdc3327331c514ced1c657d16ab76b656fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 29 Sep 2016 09:33:47 +0200 Subject: [PATCH] Find sip4_tqt and python_tqt modules in all sys.path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit d8d1f4861616f1ae1ce7eb38452be8f9edbc266e) --- src/tdedistutils.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/tdedistutils.py b/src/tdedistutils.py index 9515010..fa14021 100644 --- a/src/tdedistutils.py +++ b/src/tdedistutils.py @@ -637,6 +637,8 @@ class BuildKControlModule(Command): self.announce("Using %s for Python header files" % self.python_inc_dir) # PyQt dir + if self.pyqt_dir is None: + self.pyqt_dir = FindFileInPaths("python_tqt", sys.path) if self.pyqt_dir is None: self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt') if (FindFileInPaths("libqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None): @@ -651,6 +653,8 @@ class BuildKControlModule(Command): self.announce("Using %s for PyTDE modules" % self.pytde_dir) # Sip dir + if self.sip_dir is None: + self.sip_dir = FindFileInPaths("sip4_tqt", sys.path) if self.sip_dir is None: self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt') if (FindFileInPaths("libsip*", [self.sip_dir]) is None) and (FindFileInPaths("sip*", [self.sip_dir]) is None): @@ -1588,6 +1592,8 @@ class BuildTdeioslave(Command): self.announce("Using %s for Python header files" % self.python_inc_dir) # PyQt dir + if self.pyqt_dir is None: + self.pyqt_dir = FindFileInPaths("python_tqt", sys.path) if self.pyqt_dir is None: self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt') if (FindFileInPaths("libqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None): @@ -1602,6 +1608,8 @@ class BuildTdeioslave(Command): self.announce("Using %s for PyTDE modules" % self.pytde_dir) # Sip dir + if self.sip_dir is None: + self.sip_dir = FindFileInPaths("sip4_tqt", sys.path) if self.sip_dir is None: self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt') if (FindFileInPaths("libsip*", [self.sip_dir]) is None) and (FindFileInPaths("sip*", [self.sip_dir]) is None):