summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2019-07-16 12:24:33 +0200
committerbartus2019-07-16 12:48:55 +0200
commitc002a114861e9cb95b055bd33ba30e97d52fddee (patch)
treea6b3c5acb8bec52a913bb9b857e90fdc9d691345
parent53f1c191d46aff2d5084747770f12553b18ddca3 (diff)
downloadaur-c002a114861e9cb95b055bd33ba30e97d52fddee.tar.gz
switch cmake backend from make to ninja
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD9
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d9ade9b6bd3..d236df476dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = blender-2.7
makedepends = mesa
makedepends = llvm
makedepends = cuda
+ makedepends = ninja
depends = alembic
depends = libgl
depends = python
diff --git a/PKGBUILD b/PKGBUILD
index 46ee3619695..695928cc195 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ depends=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg' 'desktop-file-util
'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio'
'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng')
#optdepends=('cuda: CUDA support in Cycles')
-makedepends=('git' 'cmake' 'boost' 'mesa' 'llvm')
+makedepends=('git' 'cmake' 'boost' 'mesa' 'llvm' 'ninja')
makedepends+=('cuda') # disable to prevent build process from exiting Travis 50m build time limit
options=(!strip)
provides=('blender=2.7')
@@ -83,7 +83,7 @@ build() {
# export CFLAGS="${CFLAGS} -DOPENVDB_3_ABI_COMPATIBLE -DOPENVDB_USE_DEPRECATED_ABI"
# export CXXFLAGS="${CXXFLAGS} -DOPENVDB_3_ABI_COMPATIBLE -DOPENVDB_USE_DEPRECATED_ABI"
- cmake "$srcdir/blender" \
+ cmake -GNinja "$srcdir/blender" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_INSTALL_PORTABLE=OFF \
-DWITH_CXX11=ON \
@@ -104,12 +104,13 @@ build() {
-DWITH_OPENVDB_BLOSC=ON \
-DWITH_OPENCOLLADA=ON \
${_EXTRAOPTS[@]}
- make
+ export NINJA_STATUS="[%p | %cbps | %f<%r<%u ] "
+ ninja -d stats
}
package() {
cd "$srcdir/blender-build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
msg "add -2.7 sufix to desktop shortcut"
sed -i 's/=blender/=blender-2.7/g' ${pkgdir}/usr/share/applications/blender.desktop