Browse Source
Merge pull request #2940 from lioncash/zlib
externals: Track mainline zlib as a submodule
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
11 additions and
10 deletions
-
.ci/scripts/linux/docker.sh
-
.gitmodules
-
externals/CMakeLists.txt
-
externals/zlib
|
|
|
@ -11,4 +11,5 @@ ninja |
|
|
|
|
|
|
|
ccache -s |
|
|
|
|
|
|
|
ctest -VV -C Release |
|
|
|
# Ignore zlib's tests, since they aren't gated behind a CMake option. |
|
|
|
ctest -VV -E "(example|example64)" -C Release |
|
|
|
@ -47,8 +47,8 @@ |
|
|
|
path = externals/sirit |
|
|
|
url = https://github.com/ReinUsesLisp/sirit |
|
|
|
[submodule "libzip"] |
|
|
|
path = externals/libzip |
|
|
|
url = https://github.com/DarkLordZach/libzip |
|
|
|
path = externals/libzip |
|
|
|
url = https://github.com/DarkLordZach/libzip |
|
|
|
[submodule "zlib"] |
|
|
|
path = externals/zlib |
|
|
|
url = https://github.com/DarkLordZach/zlib |
|
|
|
path = externals/zlib |
|
|
|
url = https://github.com/madler/zlib |
|
|
|
@ -77,11 +77,11 @@ if (ENABLE_VULKAN) |
|
|
|
add_subdirectory(sirit) |
|
|
|
endif() |
|
|
|
|
|
|
|
# libzip |
|
|
|
add_subdirectory(libzip) |
|
|
|
|
|
|
|
# zlib |
|
|
|
add_subdirectory(zlib) |
|
|
|
add_subdirectory(zlib EXCLUDE_FROM_ALL) |
|
|
|
|
|
|
|
# libzip |
|
|
|
add_subdirectory(libzip EXCLUDE_FROM_ALL) |
|
|
|
|
|
|
|
if (ENABLE_WEB_SERVICE) |
|
|
|
# LibreSSL |
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit 094ed57db392170130bc710293568de7b576306d |
|
|
|
Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f |
