From d63fa1a5fed7258040e2ccf505f7ffd69d89d037 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 17 Nov 2019 01:38:48 +0000 Subject: [PATCH] cmake: use bundled libs --- extra/cmake/build | 13 +++++++++++-- extra/cmake/depends | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/extra/cmake/build b/extra/cmake/build index 958f69a0..91350a8f 100755 --- a/extra/cmake/build +++ b/extra/cmake/build @@ -7,14 +7,23 @@ if kiss l cmake; then -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DCMAKE_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_USE_SYSTEM_CURL=True \ + -DCMAKE_USE_SYSTEM_EXPAT=True \ + -DCMAKE_USE_SYSTEM_ZLIB=True \ + -DCMAKE_USE_SYSTEM_BZIP2=True cmake --build build DESTDIR="$1" cmake --install build else ./configure \ - --prefix=/usr + --prefix=/usr \ + --system-curl \ + --system-expat \ + --system-zlib \ + --system-bzip2 \ + --parallel="$(nproc)" make make DESTDIR="$1" install diff --git a/extra/cmake/depends b/extra/cmake/depends index 75929cf7..ae18e004 100644 --- a/extra/cmake/depends +++ b/extra/cmake/depends @@ -1 +1,5 @@ +bzip2 +curl +expat libressl +zlib