summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-06-15 17:31:11 +0100
committerMike Krus <mike.krus@kdab.com>2020-06-17 12:51:49 +0100
commitb4240827df4e7fef6c284f6e631825ed370b08d1 (patch)
tree3f973c7e821cdc4fdaafbd3b7d5a9b92b37614ce /src/render
parentc4278119a82b94777a0e0173d4fd9b7fedb40065 (diff)
Fix handling of SSE/AVX source
QtBase has macro to enable SSE handling on specific source files. But Qt3D has some classes which use those specific instruction set in headers, so any file that includes those should also have the right command line options. This adds the right command line arguments to the 3DCorePrivate target so that anything that depends on that will have the right options. 3DCore is fine because it knows about the special headers files which were tagged. Change-Id: Ia061750121fb2ab5c93600c08a5464179ca2c228 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/CMakeLists.txt4
-rw-r--r--src/render/framegraph/qframegraphnode_p.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/render/CMakeLists.txt b/src/render/CMakeLists.txt
index 79bcbd97b..a6c1b260b 100644
--- a/src/render/CMakeLists.txt
+++ b/src/render/CMakeLists.txt
@@ -290,13 +290,15 @@ qt_add_module(3DRender
LIBRARIES
Qt::Concurrent
Qt::CorePrivate
- PUBLIC_LIBRARIES
Qt::3DCorePrivate
+ PUBLIC_LIBRARIES
+ Qt::3DCore
Qt::Core
Qt::OpenGL
PRIVATE_MODULE_INTERFACE
Qt::Concurrent
Qt::CorePrivate
+ Qt::3DCorePrivate
)
# Resources:
diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h
index b9a60d79a..95c50bbf7 100644
--- a/src/render/framegraph/qframegraphnode_p.h
+++ b/src/render/framegraph/qframegraphnode_p.h
@@ -52,7 +52,7 @@
//
#include <QtCore/QtGlobal>
-#include <private/qnode_p.h>
+#include <Qt3DCore/private/qnode_p.h>
#include <Qt3DRender/qframegraphnode.h>
QT_BEGIN_NAMESPACE