From c2486f77e4ba78ba58e9894b1f6f07dd29798331 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Oct 2019 16:42:41 -0400 Subject: externals: Amend zlib submodule Supplies CMakeLists.txt file that avoids pulling in zlib's tests into the tree. This avoids needing to explicitly opt these tests out from ctest. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index ee0dc6c19..c60628f4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,5 +50,5 @@ path = externals/libzip url = https://github.com/DarkLordZach/libzip [submodule "zlib"] - path = externals/zlib - url = https://github.com/madler/zlib + path = externals/zlib/zlib + url = https://github.com/madler/zlib.git -- cgit v1.2.3 From 1643af431c50a0518b50fbc1f7c8c9470a9dfbdc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Oct 2019 17:13:40 -0400 Subject: externals: Track upstream libzip Stops relying on a fork for providing zip handling and instead tracks the upstream branch but keeps any necessary build-related changes in the source tree directly without modifying the libzip target itself. --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index c60628f4b..63bf2cda0 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/libzip + url = https://github.com/nih-at/libzip.git [submodule "zlib"] - path = externals/zlib/zlib - url = https://github.com/madler/zlib.git + path = externals/zlib/zlib + url = https://github.com/madler/zlib.git -- cgit v1.2.3