FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

qt5: Workaround for QT5 detection on macOS (Bug #1910)

This commit is contained in:
Alexander Afanasyev 2017-02-14 22:30:10 -08:00 committed by Thomas Nagy
parent c46ee9bfe3
commit acd41beef1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
waflib/Tools/qt5.py
View File

@ -718,11 +718,13 @@ def set_qt5_libs_to_check(self):
pat = pat.replace('.dll', '.lib')
if self.environ.get('QT5_FORCE_STATIC'):
pat = self.env.cxxstlib_PATTERN
re_qt = re.compile(pat % '(?P<name>Qt5.*)' + '$')
if Utils.unversioned_sys_platform() == 'darwin':
pat = "%s\.framework"
re_qt = re.compile(pat%'Qt5?(?P<name>.*)'+'$')
for x in dirlst:
m = re_qt.match(x)
if m:
self.qt5_vars.append(m.group('name'))
self.qt5_vars.append("Qt5%s" % m.group('name'))
if not self.qt5_vars:
self.fatal('cannot find any Qt5 library (%r)' % self.env.QTLIBS)