diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-04-18 10:09:47 +0300 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-27 18:04:34 +0000 |
| commit | 80e4d6db6b5636b839cef7e79b2b8ff528329ad6 (patch) | |
| tree | 42cd4cb91d695492168548ccd3dc5f8853b32f29 | |
| parent | 873caffc95b6e279d68851cc0a8ed738980ebd0c (diff) | |
Modify configure to build with no assimp
Add -no-assimp configure to build without assimp.
Task-number: QTBUG-60128
Change-Id: I2ca7bb68d3b659e18bd79039beb5cb6623473859
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/core/configure.json | 2 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 5 | ||||
| -rw-r--r-- | tools/tools.pro | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 86b31223f..47a726d82 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -4,7 +4,7 @@ "commandline": { "options": { - "assimp": { "type": "enum", "values": [ "qt", "system" ] }, + "assimp": { "type": "enum", "values": [ "qt", "system", "no" ] }, "qt3d-profile-jobs": "boolean", "qt3d-profile-gl": "boolean" } diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index 7b50f654e..cb274b472 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -1,8 +1,9 @@ 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). -config_assimp|!cross_compile: SUBDIRS += assimp - +QT_FOR_CONFIG += 3dcore-private +qtConfig(assimp):if(qtConfig(system-assimp)|!cross_compile): \ + SUBDIRS += assimp SUBDIRS += gltf qtConfig(temporaryfile):qtConfig(regularexpression) { diff --git a/tools/tools.pro b/tools/tools.pro index 4dbd7496a..8e973aecb 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,4 @@ TEMPLATE = subdirs -qtConfig(commandlineparser):!android:SUBDIRS += qgltf +QT_FOR_CONFIG += 3dcore-private +!android:qtConfig(assimp):qtConfig(commandlineparser): \ + SUBDIRS += qgltf |