diff options
| author | Karim Pinter <karim.pinter@qt.io> | 2019-02-08 11:12:13 +0200 |
|---|---|---|
| committer | Karim Pinter <karim.pinter@qt.io> | 2019-02-12 11:56:30 +0000 |
| commit | efa4665b316dbd5361b0936a1135f45c141f14aa (patch) | |
| tree | d298ada1df78c47d9ff42810f89d82d5e63cecd2 | |
| parent | 52c3f9ab735bf0dfe611402ea456afc56ccdeb37 (diff) | |
| download | qt3d-efa4665b316dbd5361b0936a1135f45c141f14aa.tar.gz | |
Enable assimp for gcc 5.x builds
If the gcc major version is higher than 4, then assimp build is enabled
so it will build on QNX and embedded linux.
Task-number: QTBUG-73700
Change-Id: I92ffb6b364e85598cb754159d0e83ef02f368104
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index e4b421606..9bb0ada36 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs # QNX is not supported, and Linux GCC 4.9 on ARM chokes on the assimp # sources (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964). QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|!cross_compile): { +qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4)): { SUBDIRS += assimp } SUBDIRS += gltf |