diff options
| -rw-r--r-- | .ci/scripts/linux/docker.sh | 3 | ||||
| -rw-r--r-- | .gitmodules | 8 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 6 | ||||
| m--------- | externals/zlib | 0 |
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 | ||
| 12 | ccache -s | 12 | ccache -s |
| 13 | 13 | ||
| 14 | ctest -VV -C Release | 14 | # Ignore zlib's tests, since they aren't gated behind a CMake option. |
| 15 | ctest -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) |
| 78 | endif() | 78 | endif() |
| 79 | 79 | ||
| 80 | # zlib | ||
| 81 | add_subdirectory(zlib EXCLUDE_FROM_ALL) | ||
| 82 | |||
| 80 | # libzip | 83 | # libzip |
| 81 | add_subdirectory(libzip) | 84 | add_subdirectory(libzip) |
| 82 | 85 | ||
| 83 | # zlib | ||
| 84 | add_subdirectory(zlib) | ||
| 85 | |||
| 86 | if (ENABLE_WEB_SERVICE) | 86 | if (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 | ||