r20996 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Fri Feb 12 20:15:15 UTC 2016
Author: jghali
Date: Fri Feb 12 20:15:14 2016
New Revision: 20996
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20996
Log:
#13726: remove incorrect cmake option from travis yml file
Modified:
trunk/Scribus/.travis.yml
Modified: trunk/Scribus/.travis.yml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20996&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml (original)
+++ trunk/Scribus/.travis.yml Fri Feb 12 20:15:14 2016
@@ -55,13 +55,13 @@
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 -DWANT_NOHEADERINSTALL=1 -DWANT_NOEXAMPLES=1 -DWANT_NOTEMPLATES=1;
+ 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;
make -j"$NPROC";
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_NOHEADERINSTALL=1 -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;
make -j8;
fi
More information about the scribus-commit
mailing list