Skip to content

Commit 90c73ac

Browse files
committed
Update to latest zlib released version
1 parent d5c8fce commit 90c73ac

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "src/ext/zlib"]
2-
path = src/ext/zlib
3-
url = https://github.com/mitsuba-renderer/zlib.git
41
[submodule "src/ext/ptex"]
52
path = src/ext/ptex
63
url = https://github.com/wdas/ptex.git
@@ -36,3 +33,6 @@
3633
path = src/ext/glfw
3734
url = https://github.com/glfw/glfw.git
3835

36+
[submodule "src/ext/zlib"]
37+
path = src/ext/zlib
38+
url = https://github.com/madler/zlib.git

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ check_ext ("lodepng" "lodepng/examples" 8c6a9e30576f07bf470ad6f09458a2dcd7a6a84a
7474
check_ext ("qoi" "qoi" 028c75fd26e5e0758c7c711216c00404994c1ad3)
7575
check_ext ("stb" "stb/tools" af1a5bc352164740c1cc1354942b1c6b72eacb8a)
7676
check_ext ("utf8proc" "utf8proc/bench" 2484e2ed5e1d9c19edcccf392a7d9920ad90dfaf)
77-
check_ext ("zlib" "zlib/doc" 54d591eabf9fe0e84c725638f8d5d8d202a093fa)
77+
check_ext ("zlib" "zlib/doc" 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71)
7878
add_compile_definitions ("$<$<CONFIG:DEBUG>:PBRT_DEBUG_BUILD>")
7979

8080
enable_testing ()

src/ext/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ add_subdirectory (double-conversion)
8282

8383
set (DOUBLE_CONVERSION_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/double-conversion PARENT_SCOPE)
8484

85-
set_property (TARGET double-conversion cctest PROPERTY FOLDER "ext")
85+
set_property (TARGET double-conversion PROPERTY FOLDER "ext")
86+
if (TARGET cctest)
87+
set_property (TARGET cctest PROPERTY FOLDER "ext")
88+
endif()
8689

8790
###########################################################################
8891
# nanovdb

src/ext/zlib

Submodule zlib updated 218 files

0 commit comments

Comments
 (0)