Skip to content

Commit fd13ef3

Browse files
parojparoj
committed
CMake: only reference sample resources, when we build the samples
fixes tons of warnings in the PIP package
1 parent 2efb56b commit fd13ef3

File tree

3 files changed

+69
-63
lines changed

3 files changed

+69
-63
lines changed

‎CMake/InstallResources.cmake‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,25 +145,22 @@ if (NOT OGRE_BUILD_PLUGIN_EXRCODEC OR NOT OGRE_COMMENT_PLUGIN_FREEIMAGE)
145145
# overlaps with freeimage
146146
set(OGRE_COMMENT_PLUGIN_EXRCODEC "#")
147147
endif ()
148-
if (NOT OGRE_BUILD_COMPONENT_TERRAIN)
149-
set(OGRE_COMMENT_COMPONENT_TERRAIN "#")
150-
endif ()
151-
if (NOT OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
152-
set(OGRE_COMMENT_COMPONENT_RTSHADERSYSTEM "#")
153-
endif ()
154-
if (NOT OGRE_BUILD_COMPONENT_VOLUME)
155-
set(OGRE_COMMENT_COMPONENT_VOLUME "#")
156-
endif ()
157-
if (NOT OGRE_BUILD_COMPONENT_TERRAIN OR NOT OGRE_BUILD_COMPONENT_PAGING)
158-
set(OGRE_COMMENT_SAMPLE_ENDLESSWORLD "#")
159-
endif ()
160148
if(NOT OGRE_BUILD_TESTS)
161149
set(OGRE_COMMENT_PLAYPENTESTS "#")
162150
endif()
163151

152+
set(OGRE_SAMPLE_RESOURCES "")
164153

165154
set(OGRE_CORE_MEDIA_DIR "${OGRE_MEDIA_DIR_REL}")
155+
166156
# CREATE CONFIG FILES - INSTALL VERSIONS
157+
158+
if(OGRE_INSTALL_SAMPLES)
159+
# deal with sample resources
160+
configure_file(${OGRE_TEMPLATES_DIR}/sample_resources.cfg.in ${PROJECT_BINARY_DIR}/sample_resources.cfg)
161+
file(READ ${PROJECT_BINARY_DIR}/sample_resources.cfg OGRE_SAMPLE_RESOURCES)
162+
endif()
163+
167164
configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/resources.cfg)
168165
configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/plugins.cfg)
169166
configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/samples.cfg)
@@ -198,6 +195,12 @@ elseif (UNIX)
198195
set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib")
199196
endif ()
200197

198+
if(OGRE_BUILD_SAMPLES)
199+
# deal with sample resources
200+
configure_file(${OGRE_TEMPLATES_DIR}/sample_resources.cfg.in ${PROJECT_BINARY_DIR}/sample_resources.cfg)
201+
file(READ ${PROJECT_BINARY_DIR}/sample_resources.cfg OGRE_SAMPLE_RESOURCES)
202+
endif()
203+
201204
if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN)
202205
# These platfroms requires all resources to be packaged inside the application bundle,
203206
# therefore install versions of configs would be copied and added as content file to each project.

‎CMake/Templates/resources.cfg.in‎

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,58 +4,9 @@ FileSystem=@OGRE_CORE_MEDIA_DIR@/Main
44
FileSystem=@OGRE_CORE_MEDIA_DIR@/RTShaderLib/GLSL
55
FileSystem=@OGRE_CORE_MEDIA_DIR@/Terrain/
66

7-
# Resources required by the sample browser and most samples.
7+
# Resources required by OgreBites::Trays
88
[Essential]
99
Zip=@OGRE_CORE_MEDIA_DIR@/packs/SdkTrays.zip
1010
Zip=@OGRE_CORE_MEDIA_DIR@/packs/profiler.zip
11-
FileSystem=@OGRE_MEDIA_DIR_REL@/thumbnails
1211

13-
# Common sample resources needed by many of the samples.
14-
# Rarely used resources should be separately loaded by the
15-
# samples which require them.
16-
[General]
17-
# PBR media must come before the scripts that reference it
18-
FileSystem=@OGRE_MEDIA_DIR_REL@/PBR
19-
FileSystem=@OGRE_MEDIA_DIR_REL@/PBR/filament
20-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/PBR
21-
22-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL
23-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL120
24-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL150
25-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL400
26-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSLES
27-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/SPIRV
28-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/Cg
29-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/HLSL
30-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/HLSL_Cg
31-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts
32-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures
33-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/terrain
34-
FileSystem=@OGRE_MEDIA_DIR_REL@/models
35-
FileSystem=@OGRE_MEDIA_DIR_REL@/particle
36-
FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia
37-
FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia/DeferredShading/post
38-
FileSystem=@OGRE_MEDIA_DIR_REL@/PCZAppMedia
39-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts/SSAO
40-
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/SSAO
41-
FileSystem=@OGRE_MEDIA_DIR_REL@/volumeTerrain
42-
FileSystem=@OGRE_MEDIA_DIR_REL@/CSMShadows
43-
Zip=@OGRE_MEDIA_DIR_REL@/packs/cubemap.zip
44-
Zip=@OGRE_MEDIA_DIR_REL@/packs/cubemapsJS.zip
45-
Zip=@OGRE_MEDIA_DIR_REL@/packs/dragon.zip
46-
Zip=@OGRE_MEDIA_DIR_REL@/packs/fresneldemo.zip
47-
Zip=@OGRE_MEDIA_DIR_REL@/packs/ogredance.zip
48-
Zip=@OGRE_MEDIA_DIR_REL@/packs/Sinbad.zip
49-
Zip=@OGRE_MEDIA_DIR_REL@/packs/skybox.zip
50-
Zip=@OGRE_MEDIA_DIR_REL@/volumeTerrain/volumeTerrainBig.zip
51-
52-
Zip=@OGRE_MEDIA_DIR_REL@/packs/DamagedHelmet.zip
53-
Zip=@OGRE_MEDIA_DIR_REL@/packs/filament_shaders.zip
54-
55-
[BSPWorld]
56-
Zip=@OGRE_MEDIA_DIR_REL@/packs/oa_rpg3dm2.pk3
57-
Zip=@OGRE_MEDIA_DIR_REL@/packs/ogretestmap.zip
58-
59-
# Materials for visual tests
60-
[Tests]
61-
FileSystem=@OGRE_TEST_MEDIA_DIR_REL@
12+
@OGRE_SAMPLE_RESOURCES@

‎CMake/Templates/sample_resources.cfg.in‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# this line will end up in the [Essential] group
2+
FileSystem=@OGRE_MEDIA_DIR_REL@/thumbnails
3+
4+
# Common sample resources needed by many of the samples.
5+
# Rarely used resources should be separately loaded by the
6+
# samples which require them.
7+
[General]
8+
# PBR media must come before the scripts that reference it
9+
FileSystem=@OGRE_MEDIA_DIR_REL@/PBR
10+
FileSystem=@OGRE_MEDIA_DIR_REL@/PBR/filament
11+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/PBR
12+
13+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL
14+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL120
15+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL150
16+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSL400
17+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/GLSLES
18+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/SPIRV
19+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/Cg
20+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/HLSL
21+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs/HLSL_Cg
22+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts
23+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures
24+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/terrain
25+
FileSystem=@OGRE_MEDIA_DIR_REL@/models
26+
FileSystem=@OGRE_MEDIA_DIR_REL@/particle
27+
FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia
28+
FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia/DeferredShading/post
29+
FileSystem=@OGRE_MEDIA_DIR_REL@/PCZAppMedia
30+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts/SSAO
31+
FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/SSAO
32+
FileSystem=@OGRE_MEDIA_DIR_REL@/volumeTerrain
33+
FileSystem=@OGRE_MEDIA_DIR_REL@/CSMShadows
34+
Zip=@OGRE_MEDIA_DIR_REL@/packs/cubemap.zip
35+
Zip=@OGRE_MEDIA_DIR_REL@/packs/cubemapsJS.zip
36+
Zip=@OGRE_MEDIA_DIR_REL@/packs/dragon.zip
37+
Zip=@OGRE_MEDIA_DIR_REL@/packs/fresneldemo.zip
38+
Zip=@OGRE_MEDIA_DIR_REL@/packs/ogredance.zip
39+
Zip=@OGRE_MEDIA_DIR_REL@/packs/Sinbad.zip
40+
Zip=@OGRE_MEDIA_DIR_REL@/packs/skybox.zip
41+
Zip=@OGRE_MEDIA_DIR_REL@/volumeTerrain/volumeTerrainBig.zip
42+
43+
Zip=@OGRE_MEDIA_DIR_REL@/packs/DamagedHelmet.zip
44+
Zip=@OGRE_MEDIA_DIR_REL@/packs/filament_shaders.zip
45+
46+
[BSPWorld]
47+
Zip=@OGRE_MEDIA_DIR_REL@/packs/oa_rpg3dm2.pk3
48+
Zip=@OGRE_MEDIA_DIR_REL@/packs/ogretestmap.zip
49+
50+
# Materials for visual tests
51+
[Tests]
52+
FileSystem=@OGRE_TEST_MEDIA_DIR_REL@

0 commit comments

Comments
 (0)