From 7cb46d20ad89f37828ff9f96363a112eadf11dbd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- tools/tools.pro | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qt3d.pro b/qt3d.pro index 2cc347a1c..81cdeefb0 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ -requires(qtConfig(opengl)) +!tools-only:requires(qtConfig(opengl)) CONFIG += examples_need_tools load(qt_parts) @@ -14,3 +14,8 @@ load(qt_parts) OTHER_FILES += \ sync.profile + +tools-only { + sub_tools.depends -= sub_src + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri index 8ba2d9a41..e973d93dd 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ QT_FOR_CONFIG += 3dcore-private -qtConfig(system-assimp):!if(cross_compile:host_build) { +!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) { QMAKE_USE_PRIVATE += assimp } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro index 8e973aecb..ad51db585 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs QT_FOR_CONFIG += 3dcore-private -!android:qtConfig(assimp):qtConfig(commandlineparser): \ +!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ SUBDIRS += qgltf