r21655 by craig - #14447: add make install to travis <Kunda>
scribus-commit
scribus-commit at lists.scribus.net
Fri Dec 16 21:31:43 UTC 2016
Author: craig
Date: Fri Dec 16 21:31:43 2016
New Revision: 21655
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21655
Log:
#14447: add make install to travis <Kunda>
Modified:
trunk/Scribus/.travis.yml
Modified: trunk/Scribus/.travis.yml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21655&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml (original)
+++ trunk/Scribus/.travis.yml Fri Dec 16 21:31:43 2016
@@ -62,13 +62,15 @@
else
export NPROC=1;
fi;
- cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US;
+ cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DCMAKE_INSTALL_PREFIX=~/.local;
make -j"$NPROC";
+ make install;
fi
- if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then
- cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DWANT_NOEXAMPLES=1 -DWANT_NOTEMPLATES=1 -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_OSX_ARCHITECTURES="x86_64" -DQT_PREFIX=/usr/local/opt/qt5;
+ cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DWANT_NOEXAMPLES=1 -DWANT_NOTEMPLATES=1 -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_OSX_ARCHITECTURES="x86_64" -DQT_PREFIX=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=~/.local;
make -j8;
+ make install;
fi
notifications:
More information about the scribus-commit
mailing list