summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Xinwei <1326710505@qq.com>2021-07-22 16:46:50 +0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-22 13:07:34 +0000
commit7621934013482fdb7093e21eea37e631824a4e28 (patch)
tree896fd6ea304c278cf35e8d7ab8b3410d91889697
parent192428a8b10ba9fb9fcbf2233df5a8ede42670e5 (diff)
CMake: Don't give plugins PUBLIC usage requirements
Plugins are not intended to be linked to. They should not have any public properties. Task-number: QTBUG-90819 Change-Id: I2cc166c2b406ea0f416cbb117cbf8181cd173e8d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ffccff03f347b971395cb212889921506d4a36f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/geometryloaders/default/CMakeLists.txt2
-rw-r--r--src/plugins/geometryloaders/fbx/CMakeLists.txt2
-rw-r--r--src/plugins/geometryloaders/gltf/CMakeLists.txt2
-rw-r--r--src/plugins/renderers/opengl/CMakeLists.txt2
-rw-r--r--src/plugins/renderers/rhi/CMakeLists.txt2
-rw-r--r--src/plugins/renderplugins/scene2d/CMakeLists.txt2
-rw-r--r--src/plugins/sceneparsers/assimp/CMakeLists.txt2
-rw-r--r--src/plugins/sceneparsers/gltf/CMakeLists.txt2
-rw-r--r--src/plugins/sceneparsers/gltfexport/CMakeLists.txt2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/geometryloaders/default/CMakeLists.txt b/src/plugins/geometryloaders/default/CMakeLists.txt
index 54a37ece0..0a71866f3 100644
--- a/src/plugins/geometryloaders/default/CMakeLists.txt
+++ b/src/plugins/geometryloaders/default/CMakeLists.txt
@@ -13,7 +13,7 @@ qt_internal_add_plugin(DefaultGeometryLoaderPlugin
objgeometryloader.cpp
plygeometryloader.cpp
stlgeometryloader.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRender
diff --git a/src/plugins/geometryloaders/fbx/CMakeLists.txt b/src/plugins/geometryloaders/fbx/CMakeLists.txt
index a9d037a8d..ebed007d9 100644
--- a/src/plugins/geometryloaders/fbx/CMakeLists.txt
+++ b/src/plugins/geometryloaders/fbx/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(fbxGeometryLoaderPlugin
SOURCES
fbxgeometryloader.cpp fbxgeometryloader.h
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRender
diff --git a/src/plugins/geometryloaders/gltf/CMakeLists.txt b/src/plugins/geometryloaders/gltf/CMakeLists.txt
index aa8f80c19..6451ffeaf 100644
--- a/src/plugins/geometryloaders/gltf/CMakeLists.txt
+++ b/src/plugins/geometryloaders/gltf/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(GLTFGeometryLoaderPlugin
SOURCES
gltfgeometryloader.cpp gltfgeometryloader.h
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRender
diff --git a/src/plugins/renderers/opengl/CMakeLists.txt b/src/plugins/renderers/opengl/CMakeLists.txt
index 242dfb5bb..36d43833f 100644
--- a/src/plugins/renderers/opengl/CMakeLists.txt
+++ b/src/plugins/renderers/opengl/CMakeLists.txt
@@ -105,7 +105,7 @@ qt_internal_add_plugin(OpenGLRendererPlugin
managers
renderer
textures
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRender
diff --git a/src/plugins/renderers/rhi/CMakeLists.txt b/src/plugins/renderers/rhi/CMakeLists.txt
index f9664a995..7051088b4 100644
--- a/src/plugins/renderers/rhi/CMakeLists.txt
+++ b/src/plugins/renderers/rhi/CMakeLists.txt
@@ -81,7 +81,7 @@ qt_internal_add_plugin(RhiRendererPlugin
managers
renderer
textures
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRender
diff --git a/src/plugins/renderplugins/scene2d/CMakeLists.txt b/src/plugins/renderplugins/scene2d/CMakeLists.txt
index b4ea5d31d..a53ffe14f 100644
--- a/src/plugins/renderplugins/scene2d/CMakeLists.txt
+++ b/src/plugins/renderplugins/scene2d/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(Scene2DPlugin
SOURCES
main.cpp
scene2dplugin.cpp scene2dplugin.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DQuickScene2D
diff --git a/src/plugins/sceneparsers/assimp/CMakeLists.txt b/src/plugins/sceneparsers/assimp/CMakeLists.txt
index 63c1453aa..f22fe6e98 100644
--- a/src/plugins/sceneparsers/assimp/CMakeLists.txt
+++ b/src/plugins/sceneparsers/assimp/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(AssimpSceneImportPlugin
assimphelpers.cpp assimphelpers.h
assimpimporter.cpp assimpimporter.h
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DAnimation
Qt::3DCore
Qt::3DCorePrivate
diff --git a/src/plugins/sceneparsers/gltf/CMakeLists.txt b/src/plugins/sceneparsers/gltf/CMakeLists.txt
index a2e8aaf25..ac11ff716 100644
--- a/src/plugins/sceneparsers/gltf/CMakeLists.txt
+++ b/src/plugins/sceneparsers/gltf/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(GLTFSceneImportPlugin
SOURCES
gltfimporter.cpp gltfimporter.h
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DExtras
diff --git a/src/plugins/sceneparsers/gltfexport/CMakeLists.txt b/src/plugins/sceneparsers/gltfexport/CMakeLists.txt
index 6a2473a36..d915fbdd1 100644
--- a/src/plugins/sceneparsers/gltfexport/CMakeLists.txt
+++ b/src/plugins/sceneparsers/gltfexport/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(GLTFSceneExportPlugin
SOURCES
gltfexporter.cpp gltfexporter.h
main.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DExtras