From dd95c55f9f470823d369090c3518e61a2e535388 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 14 Feb 2020 18:25:52 +0200 Subject: [PATCH] cmake: clean build --- extra/cmake/build | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/extra/cmake/build b/extra/cmake/build index 401a7c14..709678db 100755 --- a/extra/cmake/build +++ b/extra/cmake/build @@ -1,8 +1,8 @@ #!/bin/sh -e -# Use cmake to build cmake if installed. -# This leads to a much faster build. if kiss l cmake; then + export DESTDIR=$1 + cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ @@ -15,7 +15,7 @@ if kiss l cmake; then -DBUILD_TESTING=OFF cmake --build build - DESTDIR="$1" cmake --install build + cmake --install build else ./configure \ @@ -23,16 +23,11 @@ else --system-curl \ --system-expat \ --system-zlib \ - --system-bzip2 \ - --parallel="$(nproc)" + --system-bzip2 make make DESTDIR="$1" install fi -# Grab the package version. -IFS=. read -r ver1 ver2 _ < "${0%/*}/version" - -# Remove docs. rm -rf "$1/usr/doc" -rm -rf "$1/usr/share/cmake-$ver1.$ver2/Help" +rm -rf "$1/usr/share/cmake"-?.?/Help