Skip to content

Commit b9a1f2b

Browse files
Update bgfx.cmake (#1541)
Updated bgfx.cmake, removing minz from bimg_decode. This should avoid symbol duplication issues on projects that use compiler flags such as clang's ```-all_load``` and ```-no_deduplicate```.
1 parent 9b93d23 commit b9a1f2b

File tree

6 files changed

+7
-2
lines changed

6 files changed

+7
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ FetchContent_Declare(base-n
2323
GIT_TAG 7573e77c0b9b0e8a5fb63d96dbde212c921993b4)
2424
FetchContent_Declare(bgfx.cmake
2525
GIT_REPOSITORY https://github.com/BabylonJS/bgfx.cmake.git
26-
GIT_TAG fdf3ed4a62acabd7025d0a843f6d8a9aff5e3612)
26+
GIT_TAG ed8e11f781024120980cdbbc5871cb2ce2f63423)
2727
FetchContent_Declare(CMakeExtensions
2828
GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git
2929
GIT_TAG ea28b7689530bfdc4905806f27ecf7e8ed4b5419)

Core/Graphics/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ target_link_libraries(Graphics
4646
PRIVATE bimg
4747
PRIVATE bimg_encode
4848
PRIVATE bimg_decode
49+
PRIVATE minz
4950
PRIVATE bx)
5051

5152
target_compile_definitions(Graphics

Dependencies/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ set_property(TARGET bimg_encode PROPERTY FOLDER Dependencies/bgfx/3rdparty)
6060
set_property(TARGET bimg_encode PROPERTY UNITY_BUILD false)
6161
set_property(TARGET bimg_decode PROPERTY FOLDER Dependencies/bgfx/3rdparty)
6262
set_property(TARGET bimg_decode PROPERTY UNITY_BUILD false)
63+
set_property(TARGET minz PROPERTY FOLDER Dependencies/bgfx/3rdparty)
64+
set_property(TARGET minz PROPERTY UNITY_BUILD false)
6365
if(TARGET tinyexr)
6466
set_property(TARGET tinyexr PROPERTY FOLDER Dependencies/bgfx/3rdparty)
6567
endif()

Install/Install.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endfunction()
3535
install_targets(arcana)
3636

3737
## bgfx
38-
install_targets(bimg_encode bimg_decode bgfx bimg bx)
38+
install_targets(bimg_encode bimg_decode bgfx bimg bx minz)
3939

4040
## glslang
4141
install_targets(GenericCodeGen glslang MachineIndependent OGLCompiler OSDependent SPIRV glslang-default-resource-limits)

Install/Test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ target_link_libraries(TestInstall
142142
arcana
143143
bimg_encode
144144
bimg_decode
145+
minz
145146
bgfx
146147
bimg
147148
bx

Plugins/NativeEngine/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ target_link_libraries(NativeEngine
4343
PRIVATE bimg_encode
4444
PRIVATE bimg_decode
4545
PRIVATE bx
46+
PRIVATE minz
4647
PRIVATE glslang
4748
PRIVATE glslang-default-resource-limits
4849
PRIVATE GraphicsDevice

0 commit comments

Comments
 (0)