summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-02-28 13:50:53 +0100
committerbartus2020-02-28 13:50:53 +0100
commitb365ccc074f5b7f8329620a440096070b2ed9299 (patch)
tree1f7929e86cfcbf03c88149fbe8d1b4f833681fcd
parentc65a0a5977e3542849f6e71d8e96d595249e28f1 (diff)
downloadaur-b365ccc074f5b7f8329620a440096070b2ed9299.tar.gz
Switch to Ninja.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6e7edf62801..bcf688953e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,6 +8,7 @@ pkgbase = cloudcompare-git
license = GPL2
makedepends = git
makedepends = cmake
+ makedepends = ninja
makedepends = pcl
makedepends = libharu
makedepends = proj
diff --git a/PKGBUILD b/PKGBUILD
index 4254d423f45..3638223e6f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64')
url="http://www.danielgm.net/cc/"
license=('GPL2')
depends=('qt5-base' 'qt5-tools' 'qt5-svg' 'glu' 'glew' 'mesa' 'vxl' 'ffmpeg' 'cgal' 'pdal')
-makedepends=('git' 'cmake' 'pcl' 'libharu' 'proj' 'python' 'doxygen' 'laz-perf')
+makedepends=('git' 'cmake' 'ninja' 'pcl' 'libharu' 'proj' 'python' 'doxygen' 'laz-perf')
optdepends=('pcl')
conflicts=('cloudcompare')
provides=('cloudcompare')
@@ -41,6 +41,7 @@ build() {
mkdir -p build && cd build
cmake .. \
+ -G Ninja \
-Wno-dev \
-DCMAKE_CXX_FLAGS=-fpermissive \
-DOPTION_PDAL_LAS=ON \
@@ -74,12 +75,11 @@ build() {
-DINSTALL_QBROOM_PLUGIN=true \
-DINSTALL_QHOUGH_NORMALS_PLUGIN=true \
-DEIGEN_ROOT_DIR=/usr/include/eigen3
- make
+ ninja -C build "${MAKEFLAGS:--j1}"
}
package() {
- cd ${srcdir}/${name}/build
- make DESTDIR="$pkgdir/" install
+ DESTDIR="$pkgdir" ninja -C build install
# install *.desktop files
install -D -m 644 ${srcdir}/*.desktop -t ${pkgdir}/usr/share/applications/