From e73ef93876ce070b4029cecdf4a3c4701c9e5b64 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 19 May 2021 15:33:47 +0200 Subject: Use fixed qt_add_resource BASE argument Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: I8372086c40043a6bd1d306b6bfb711e96ddc7cb7 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CI Bot --- src/datavisualization/CMakeLists.txt | 136 +++++++++++++++++------------------ 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'src/datavisualization/CMakeLists.txt') diff --git a/src/datavisualization/CMakeLists.txt b/src/datavisualization/CMakeLists.txt index 5c7d5594..1e4fdd09 100644 --- a/src/datavisualization/CMakeLists.txt +++ b/src/datavisualization/CMakeLists.txt @@ -181,35 +181,35 @@ set_source_files_properties("engine/meshes/sphereSmooth.obj" PROPERTIES QT_RESOURCE_ALIAS "sphereSmooth" ) set(mesh_resource_files - "arrowFlat.obj" - "arrowSmooth.obj" - "background.obj" - "backgroundNoFloor.obj" - "barFilledFlat.obj" - "barFilledSmooth.obj" - "barFlat.obj" - "barSmooth.obj" - "coneFilledFlat.obj" - "coneFilledSmooth.obj" - "coneFlat.obj" - "coneSmooth.obj" - "cubeFilledFlat.obj" - "cubeFilledSmooth.obj" - "cubeFlat.obj" - "cubeSmooth.obj" - "cylinderFilledFlat.obj" - "cylinderFilledSmooth.obj" - "cylinderFlat.obj" - "cylinderSmooth.obj" - "minimalFlat.obj" - "minimalSmooth.obj" - "plane.obj" - "pyramidFilledFlat.obj" - "pyramidFilledSmooth.obj" - "pyramidFlat.obj" - "pyramidSmooth.obj" - "sphere.obj" - "sphereSmooth.obj" + "engine/meshes/arrowFlat.obj" + "engine/meshes/arrowSmooth.obj" + "engine/meshes/background.obj" + "engine/meshes/backgroundNoFloor.obj" + "engine/meshes/barFilledFlat.obj" + "engine/meshes/barFilledSmooth.obj" + "engine/meshes/barFlat.obj" + "engine/meshes/barSmooth.obj" + "engine/meshes/coneFilledFlat.obj" + "engine/meshes/coneFilledSmooth.obj" + "engine/meshes/coneFlat.obj" + "engine/meshes/coneSmooth.obj" + "engine/meshes/cubeFilledFlat.obj" + "engine/meshes/cubeFilledSmooth.obj" + "engine/meshes/cubeFlat.obj" + "engine/meshes/cubeSmooth.obj" + "engine/meshes/cylinderFilledFlat.obj" + "engine/meshes/cylinderFilledSmooth.obj" + "engine/meshes/cylinderFlat.obj" + "engine/meshes/cylinderSmooth.obj" + "engine/meshes/minimalFlat.obj" + "engine/meshes/minimalSmooth.obj" + "engine/meshes/plane.obj" + "engine/meshes/pyramidFilledFlat.obj" + "engine/meshes/pyramidFilledSmooth.obj" + "engine/meshes/pyramidFlat.obj" + "engine/meshes/pyramidSmooth.obj" + "engine/meshes/sphere.obj" + "engine/meshes/sphereSmooth.obj" ) set_source_files_properties("engine/shaders/3dsliceframes.frag" @@ -330,45 +330,45 @@ set_source_files_properties("engine/shaders/texture_ES2.frag" PROPERTIES QT_RESOURCE_ALIAS "fragmentTextureES2" ) set(shader_resource_files - "3dsliceframes.frag" - "colorOnY.frag" - "colorOnY_ES2.frag" - "default.frag" - "default.vert" - "defaultNoMatrices.vert" - "default_ES2.frag" - "depth.frag" - "depth.vert" - "label.frag" - "label.vert" - "plainColor.frag" - "plainColor.vert" - "point_ES2.vert" - "point_ES2_UV.vert" - "position.vert" - "positionmap.frag" - "shadow.frag" - "shadow.vert" - "shadowNoMatrices.vert" - "shadowNoTex.frag" - "shadowNoTexColorOnY.frag" - "surface.frag" - "surfaceFlat.frag" - "surfaceFlat.vert" - "surfaceShadowFlat.frag" - "surfaceShadowFlat.vert" - "surfaceShadowNoTex.frag" - "surfaceTexturedFlat.frag" - "surfaceTexturedShadow.frag" - "surfaceTexturedShadowFlat.frag" - "surface_ES2.frag" - "texture.frag" - "texture.vert" - "texture3d.frag" - "texture3d.vert" - "texture3dlowdef.frag" - "texture3dslice.frag" - "texture_ES2.frag" + "engine/shaders/3dsliceframes.frag" + "engine/shaders/colorOnY.frag" + "engine/shaders/colorOnY_ES2.frag" + "engine/shaders/default.frag" + "engine/shaders/default.vert" + "engine/shaders/defaultNoMatrices.vert" + "engine/shaders/default_ES2.frag" + "engine/shaders/depth.frag" + "engine/shaders/depth.vert" + "engine/shaders/label.frag" + "engine/shaders/label.vert" + "engine/shaders/plainColor.frag" + "engine/shaders/plainColor.vert" + "engine/shaders/point_ES2.vert" + "engine/shaders/point_ES2_UV.vert" + "engine/shaders/position.vert" + "engine/shaders/positionmap.frag" + "engine/shaders/shadow.frag" + "engine/shaders/shadow.vert" + "engine/shaders/shadowNoMatrices.vert" + "engine/shaders/shadowNoTex.frag" + "engine/shaders/shadowNoTexColorOnY.frag" + "engine/shaders/surface.frag" + "engine/shaders/surfaceFlat.frag" + "engine/shaders/surfaceFlat.vert" + "engine/shaders/surfaceShadowFlat.frag" + "engine/shaders/surfaceShadowFlat.vert" + "engine/shaders/surfaceShadowNoTex.frag" + "engine/shaders/surfaceTexturedFlat.frag" + "engine/shaders/surfaceTexturedShadow.frag" + "engine/shaders/surfaceTexturedShadowFlat.frag" + "engine/shaders/surface_ES2.frag" + "engine/shaders/texture.frag" + "engine/shaders/texture.vert" + "engine/shaders/texture3d.frag" + "engine/shaders/texture3d.vert" + "engine/shaders/texture3dlowdef.frag" + "engine/shaders/texture3dslice.frag" + "engine/shaders/texture_ES2.frag" ) qt_internal_add_resource(DataVisualization "shaders" -- cgit v1.2.3