GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Add brotli library' (#202) from misc2 into master

Browse Source 
Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/202
Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com>
This commit is contained in:
Oleksii_Hyzha
2025-02-21 10:01:49 +01:00
parent d601af055e 25fccda23b
commit e2ff63dcde
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
3rdParty/CMakeLists.txt vendored
View File

@@ -36,6 +36,7 @@ add_subdirectory(eastl)
add_subdirectory(moodycamel_concurrentqueue)
add_subdirectory(tinyusdz)
add_subdirectory(dds_image)
add_subdirectory(brotli)
if (NOT IOS AND OPENVULKANO_ENABLE_CURL)
add_subdirectory(curl)

17
3rdParty/brotli/CMakeLists.txt vendored Normal file
View File

@@ -0,0 +1,17 @@
include (FetchContent)
if(NOT DEFINED BROTLI_REPO)
set(BROTLI_REPO https://github.com/google/brotli.git)
endif ()
FetchContent_Declare(
brotli
GIT_REPOSITORY ${BROTLI_REPO}
GIT_TAG v1.1.0
GIT_SHALLOW TRUE
)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
set(BROTLI_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
set(BROTLI_DISABLE_TESTS OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(brotli)

2
openVulkanoCpp/CMakeLists.txt
View File

@@ -69,7 +69,7 @@ if (NOT ANDROID AND NOT IOS)
endif()
endif()
target_link_libraries(openVulkanoCpp PUBLIC magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid ryml unordered_dense concurrentqueue units dds_image)
target_link_libraries(openVulkanoCpp PUBLIC magic_enum brotlienc brotlidec yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal TracyClient stud-uuid ryml unordered_dense concurrentqueue units dds_image)
if (OPENVULKANO_ENABLE_KTX)
target_link_libraries(openVulkanoCpp PUBLIC ktx)
endif ()