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

Merge pull request #1800 from fedepell/qt57conf 

qt5: qt5 5.7 detection, added also case with std=c++11 but no fPIC/fPIE
This commit is contained in:
ita1024 2016-08-19 07:35:17 +02:00 committed by GitHub
parent adea933f1a a9bb62b3f6
commit 37f49e5f55
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Tools/qt5.py
View File

@ -473,7 +473,7 @@ def configure(self):
# Qt5 may be compiled with '-reduce-relocations' which requires dependent programs to have -fPIE or -fPIC?
frag = '#include <QApplication>\nint main(int argc, char **argv) {return 0;}\n'
uses = 'QT5CORE QT5WIDGETS QT5GUI'
for flag in [[], '-fPIE', '-fPIC', ['-std=c++11', '-fPIE'], ['-std=c++11', '-fPIC']]:
for flag in [[], '-fPIE', '-fPIC', '-std=c++11' , ['-std=c++11', '-fPIE'], ['-std=c++11', '-fPIC']]:
msg = 'See if Qt files compile '
if flag:
msg += 'with %s' % flag