diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-07-04 09:47:15 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2017-08-02 06:24:27 +0000 |
| commit | 718165fc244f824c6a82c1eeb94afc563a35adeb (patch) | |
| tree | 086970e557ad38d765cfa493875e5da408fbe0b2 /src/core | |
| parent | a20f0c5228861676bb46c15cb1010ca311895c33 (diff) | |
Allow to disable aspects at configure time
This allows to remove dependencies and reduce deployment size when a given
aspect is not required.
Change-Id: I5aa90e4825b375cd446c47727aa11d03c40703c9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/configure.json | 51 | ||||
| -rw-r--r-- | src/core/qt3dcore_global.h | 1 |
2 files changed, 50 insertions, 2 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 47a726d82..1640ec25a 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -6,7 +6,12 @@ "options": { "assimp": { "type": "enum", "values": [ "qt", "system", "no" ] }, "qt3d-profile-jobs": "boolean", - "qt3d-profile-gl": "boolean" + "qt3d-profile-gl": "boolean", + "qt3d-render": "boolean", + "qt3d-input": "boolean", + "qt3d-logic": "boolean", + "qt3d-extras": "boolean", + "qt3d-animation": "boolean" } }, @@ -48,6 +53,38 @@ "privateFeature", { "type": "define", "name": "QT3D_OPENGL_RUN_STATS", "value": 1 } ] + }, + "qt3d-render": { + "label": "Render aspect", + "purpose": "Use the 3D Render Aspect library", + "section": "Aspects", + "output": [ "publicFeature" ] + }, + "qt3d-input": { + "label": "Input aspect", + "purpose": "Use the 3D Input Aspect library", + "section": "Aspects", + "output": [ "publicFeature" ] + }, + "qt3d-logic": { + "label": "Logic aspect", + "purpose": "Use the 3D Logic Aspect library", + "section": "Aspects", + "output": [ "publicFeature" ] + }, + "qt3d-extras": { + "label": "Extras aspect", + "purpose": "Use the 3D Extra library", + "section": "Aspects", + "condition": "features.qt3d-render && features.qt3d-input && features.qt3d-logic", + "output": [ "publicFeature" ] + }, + "qt3d-animation": { + "label": "Animation aspect", + "purpose": "Use the 3D Animation Aspect library", + "section": "Aspects", + "condition": "features.qt3d-render", + "output": [ "publicFeature" ] } }, @@ -61,7 +98,17 @@ "assimp", "system-assimp", "qt3d-profile-jobs", - "qt3d-profile-gl" + "qt3d-profile-gl", + { + "section": "Aspects", + "entries": [ + "qt3d-render", + "qt3d-input", + "qt3d-logic", + "qt3d-animation", + "qt3d-extras" + ] + } ] } ] diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h index e11907cad..a449a2e52 100644 --- a/src/core/qt3dcore_global.h +++ b/src/core/qt3dcore_global.h @@ -41,6 +41,7 @@ #define QT3DCORE_GLOBAL_H #include <QtCore/qglobal.h> +#include <Qt3DCore/qt3dcore-config.h> QT_BEGIN_NAMESPACE |