From 46138a939f6a65e4e3eeaf9ff979f752a043b504 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 17 Mar 2020 12:38:05 +0100 Subject: [PATCH] QML2Puppet: Quieten CMake build when no Quick3D was found Each of the files added by Quick3D is wrapped in an ifdef, so that moc sees empty files and warns about them. Change-Id: I565eab6cbc33bd0d7eb2be681d274c092a7cbaed Reviewed-by: Cristian Adam --- src/tools/qml2puppet/CMakeLists.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index da25ec53964..94bc6a2fce5 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -97,6 +97,16 @@ extend_qtc_executable(qml2puppet FEATURE_INFO "Qt Quick 3D" DEPENDS Qt5::Quick3D Qt5::Quick3DPrivate DEFINES QUICK3D_MODULE + + SOURCES_PREFIX "${SRCDIR}/qmlpuppet/editor3d" + SOURCES + generalhelper.cpp generalhelper.h + mousearea3d.cpp mousearea3d.h + camerageometry.cpp camerageometry.h + lightgeometry.cpp lightgeometry.h + gridgeometry.cpp gridgeometry.h + selectionboxgeometry.cpp selectionboxgeometry.h + linegeometry.cpp linegeometry.h ) extend_qtc_executable(qml2puppet @@ -108,18 +118,6 @@ extend_qtc_executable(qml2puppet nodeinstanceserverinterface.cpp nodeinstanceserverinterface.h ) -extend_qtc_executable(qml2puppet - SOURCES_PREFIX "${SRCDIR}/qml2puppet/editor3d" - SOURCES - generalhelper.cpp generalhelper.h - mousearea3d.cpp mousearea3d.h - camerageometry.cpp camerageometry.h - lightgeometry.cpp lightgeometry.h - gridgeometry.cpp gridgeometry.h - selectionboxgeometry.cpp selectionboxgeometry.h - linegeometry.cpp linegeometry.h -) - extend_qtc_executable(qml2puppet SOURCES_PREFIX "${SRCDIR}/qml2puppet/instances" SOURCES