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

qt5: cope with library names like 'Qt5Core' instead of 'QtCore5', as in Qt 5.4 on Windows

This commit is contained in:
Dale Stewart 2015-05-14 16:15:57 -05:00
parent 802e937d73
commit 1bc6c745c9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
waflib/Tools/qt5.py
View File

@ -642,7 +642,7 @@ def find_qt5_libraries(self):
env.append_unique('LIBPATH_' + uselib, qtlibs) env.append_unique('LIBPATH_' + uselib, qtlibs)
env.append_unique('INCLUDES_' + uselib, qtincludes) env.append_unique('INCLUDES_' + uselib, qtincludes)
env.append_unique('INCLUDES_' + uselib, os.path.join(qtincludes, i)) env.append_unique('INCLUDES_' + uselib, os.path.join(qtincludes, i.replace('Qt5', 'Qt')))
# Debug library names are like QtCore5d # Debug library names are like QtCore5d
uselib = i.upper() + "_debug" uselib = i.upper() + "_debug"
@ -657,7 +657,7 @@ def find_qt5_libraries(self):
env.append_unique('LIBPATH_' + uselib, qtlibs) env.append_unique('LIBPATH_' + uselib, qtlibs)
env.append_unique('INCLUDES_' + uselib, qtincludes) env.append_unique('INCLUDES_' + uselib, qtincludes)
env.append_unique('INCLUDES_' + uselib, os.path.join(qtincludes, i)) env.append_unique('INCLUDES_' + uselib, os.path.join(qtincludes, i.replace('Qt5', 'Qt')))
else: else:
for i in self.qt5_vars_debug + self.qt5_vars: for i in self.qt5_vars_debug + self.qt5_vars:
self.check_cfg(package=i, args='--cflags --libs', mandatory=False) self.check_cfg(package=i, args='--cflags --libs', mandatory=False)
@ -721,7 +721,7 @@ def set_qt5_defines(self):
if sys.platform != 'win32': if sys.platform != 'win32':
return return
for x in self.qt5_vars: for x in self.qt5_vars:
y = x[2:].upper() y=x.replace('Qt5', 'Qt')[2:].upper()
self.env.append_unique('DEFINES_%s' % x.upper(), 'QT_%s_LIB' % y) self.env.append_unique('DEFINES_%s' % x.upper(), 'QT_%s_LIB' % y)
self.env.append_unique('DEFINES_%s_DEBUG' % x.upper(), 'QT_%s_LIB' % y) self.env.append_unique('DEFINES_%s_DEBUG' % x.upper(), 'QT_%s_LIB' % y)