summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.ci/scripts/linux/docker.sh3
-rw-r--r--.gitmodules8
-rw-r--r--externals/CMakeLists.txt6
m---------externals/zlib0
4 files changed, 9 insertions, 8 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh
index f538a4081..296b14e56 100644
--- a/.ci/scripts/linux/docker.sh
+++ b/.ci/scripts/linux/docker.sh
@@ -11,4 +11,5 @@ ninja
11 11
12ccache -s 12ccache -s
13 13
14ctest -VV -C Release 14# Ignore zlib's tests, since they aren't gated behind a CMake option.
15ctest -VV -E "(example|example64)" -C Release
diff --git a/.gitmodules b/.gitmodules
index f3051cca0..35e0d1240 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -47,8 +47,8 @@
47 path = externals/sirit 47 path = externals/sirit
48 url = https://github.com/ReinUsesLisp/sirit 48 url = https://github.com/ReinUsesLisp/sirit
49[submodule "libzip"] 49[submodule "libzip"]
50 path = externals/libzip 50 path = externals/libzip
51 url = https://github.com/DarkLordZach/libzip 51 url = https://github.com/DarkLordZach/libzip
52[submodule "zlib"] 52[submodule "zlib"]
53 path = externals/zlib 53 path = externals/zlib
54 url = https://github.com/DarkLordZach/zlib 54 url = https://github.com/madler/zlib
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d797d9fc9..d6815fbc5 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -77,12 +77,12 @@ if (ENABLE_VULKAN)
77 add_subdirectory(sirit) 77 add_subdirectory(sirit)
78endif() 78endif()
79 79
80# zlib
81add_subdirectory(zlib EXCLUDE_FROM_ALL)
82
80# libzip 83# libzip
81add_subdirectory(libzip) 84add_subdirectory(libzip)
82 85
83# zlib
84add_subdirectory(zlib)
85
86if (ENABLE_WEB_SERVICE) 86if (ENABLE_WEB_SERVICE)
87 # LibreSSL 87 # LibreSSL
88 set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") 88 set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
diff --git a/externals/zlib b/externals/zlib
Subproject 094ed57db392170130bc710293568de7b576306 Subproject cacf7f1d4e3d44d871b605da3b647f07d718623