mirror of https://gitlab.com/ita1024/waf.git
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:
commit
37f49e5f55
|
@ -473,7 +473,7 @@ def configure(self):
|
||||||
# Qt5 may be compiled with '-reduce-relocations' which requires dependent programs to have -fPIE or -fPIC?
|
# 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'
|
frag = '#include <QApplication>\nint main(int argc, char **argv) {return 0;}\n'
|
||||||
uses = 'QT5CORE QT5WIDGETS QT5GUI'
|
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 '
|
msg = 'See if Qt files compile '
|
||||||
if flag:
|
if flag:
|
||||||
msg += 'with %s' % flag
|
msg += 'with %s' % flag
|
||||||
|
|
Loading…
Reference in New Issue