From 4cd75323c448db3dd06a0f0f70ec4d8f9ae3ad2c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- tools/tools.pro | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro index c5232e116..cf5345352 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ -qtHaveModule(gui): \ +!tools-only:qtHaveModule(gui): \ requires(qtConfig(opengl):!wasm) CONFIG += examples_need_tools @@ -16,3 +16,8 @@ load(qt_parts) OTHER_FILES += \ sync.profile \ .qmake.conf + +tools-only { + sub_tools.depends -= sub_src + SUBDIRS = sub_tools +} \ No newline at end of file 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 3b457ed50..9f5376a0a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,9 +1,9 @@ TEMPLATE = subdirs -!qtHaveModule(3dcore): \ +!tools-only:!qtHaveModule(3dcore): \ return() QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser): { +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { SUBDIRS += qgltf }