summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-01-26 11:34:47 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-27 11:30:47 +0000
commitb912ea84a071108d6c5d961eb70e2f26174c5430 (patch)
treebb5ea2e256d3acdd65765ad405cf78fd56e26993
parent0377a55a4f6a654f6a9b3372a3ac7f6c79da64a6 (diff)
CMake: Use big resources in some examples
Update CMake project files for examples that use exampleresources/textures.qrc to use big resources. This avoids too much memory load on the compiler process. Fixes: QTBUG-100201 Change-Id: Iba933361f66ccb459f6fd1b36774748117b9655c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 30199e8ab7e05f5370fc28261c9dc72352fb0c1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/qt3d/lights/CMakeLists.txt38
-rw-r--r--examples/qt3d/pbr-materials/CMakeLists.txt38
-rw-r--r--examples/qt3d/phong-cubes/CMakeLists.txt38
3 files changed, 6 insertions, 108 deletions
diff --git a/examples/qt3d/lights/CMakeLists.txt b/examples/qt3d/lights/CMakeLists.txt
index 2ff727721..9606bc369 100644
--- a/examples/qt3d/lights/CMakeLists.txt
+++ b/examples/qt3d/lights/CMakeLists.txt
@@ -74,43 +74,9 @@ qt6_add_resources(lights "obj"
FILES
${obj_resource_files}
)
-set(textures_resource_files
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- "../exampleresources/assets/textures/no-ao.png"
-)
-qt6_add_resources(lights "textures"
- PREFIX
- "/"
- BASE
- "../exampleresources"
- FILES
- ${textures_resource_files}
-)
+qt6_add_big_resources(big_resources ../exampleresources/textures.qrc)
+target_sources(lights PRIVATE ${big_resources})
install(TARGETS lights
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/qt3d/pbr-materials/CMakeLists.txt b/examples/qt3d/pbr-materials/CMakeLists.txt
index d75d0f2ca..dfbd1c4fa 100644
--- a/examples/qt3d/pbr-materials/CMakeLists.txt
+++ b/examples/qt3d/pbr-materials/CMakeLists.txt
@@ -94,43 +94,9 @@ qt6_add_resources(pbr-materials "obj"
FILES
${obj_resource_files}
)
-set(textures_resource_files
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- "../exampleresources/assets/textures/no-ao.png"
-)
-qt6_add_resources(pbr-materials "textures"
- PREFIX
- "/"
- BASE
- "../exampleresources"
- FILES
- ${textures_resource_files}
-)
+qt6_add_big_resources(big_resources ../exampleresources/textures.qrc)
+target_sources(pbr-materials PRIVATE ${big_resources})
install(TARGETS pbr-materials
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/qt3d/phong-cubes/CMakeLists.txt b/examples/qt3d/phong-cubes/CMakeLists.txt
index b9ce2c46b..512cb91a9 100644
--- a/examples/qt3d/phong-cubes/CMakeLists.txt
+++ b/examples/qt3d/phong-cubes/CMakeLists.txt
@@ -57,43 +57,9 @@ qt6_add_resources(phong-cubes "phong-cubes"
FILES
${phong-cubes_resource_files}
)
-set(textures_resource_files
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
- "../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- "../exampleresources/assets/textures/no-ao.png"
-)
-qt6_add_resources(phong-cubes "textures"
- PREFIX
- "/"
- BASE
- "../exampleresources"
- FILES
- ${textures_resource_files}
-)
+qt6_add_big_resources(big_resources ../exampleresources/textures.qrc)
+target_sources(phong-cubes PRIVATE ${big_resources})
install(TARGETS phong-cubes
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"