diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-10-04 04:53:03 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-10-04 11:01:57 +0200 |
| commit | 80bdb44ead002e37eec935fb905c604e7d7a1d43 (patch) | |
| tree | 953c9e9244ccba2f9209a881a11d23f4a2a22136 | |
| parent | Merge pull request #2539 from DarkLordZach/bcat (diff) | |
| download | yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.gz yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.bz2 yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.lz yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.xz yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.zst yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.zip | |
| -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 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 diff --git a/.gitmodules b/.gitmodules index f3051cca0..35e0d1240 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 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) add_subdirectory(sirit) endif() +# zlib +add_subdirectory(zlib EXCLUDE_FROM_ALL) + # libzip add_subdirectory(libzip) -# zlib -add_subdirectory(zlib) - if (ENABLE_WEB_SERVICE) # LibreSSL set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") diff --git a/externals/zlib b/externals/zlib -Subproject 094ed57db392170130bc710293568de7b576306 +Subproject cacf7f1d4e3d44d871b605da3b647f07d718623 |