From 5cae7b3db1165119d74a3a6b0ae9a43b6e8e0bfa Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 4 Feb 2020 21:31:12 +0400 Subject: [PATCH] Use system zlib on Linux, update submodules. --- cmake | 2 +- docs/building-cmake.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake b/cmake index 22b099429..d28d9d632 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 22b099429aa9368fe0339ee48bcf6dbcdd3ac8d5 +Subproject commit d28d9d632a10a1efb7af33b9155aaf86ebf61137 diff --git a/docs/building-cmake.md b/docs/building-cmake.md index e903f2694..f1b4b8763 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -253,12 +253,12 @@ Go to ***BuildPath*** and run -force-debug-info \ -opensource \ -confirm-license \ - -qt-zlib \ -qt-libpng \ -qt-libjpeg \ -qt-harfbuzz \ -qt-pcre \ -qt-xcb \ + -system-zlib \ -system-freetype \ -fontconfig \ -no-opengl \