Build statically and build in a subdirectory.

This commit is contained in:
Joseph Lenox 2018-06-06 18:24:47 -05:00 committed by Joseph Lenox
parent 8b36624329
commit 9d7d83990e

View File

@ -3,8 +3,9 @@ before_install:
- sh package/linux/travis-decrypt-key - sh package/linux/travis-decrypt-key
script: script:
- bash package/linux/travis-setup.sh - bash package/linux/travis-setup.sh
- cmake -DBOOST_ROOT=$BOOST_DIR src/ - mkdir build && cd build
- make - cmake -DBOOST_ROOT=$BOOST_DIR -DSLIC3R_STATIC=1 ../src
- cmake --build .
branches: branches:
only: only:
- master - master
@ -44,8 +45,8 @@ matrix:
- CC=gcc-7 - CC=gcc-7
- CXX=g++-7 - CXX=g++-7
- BOOST_DIR=$HOME/boost_1_63_0 - BOOST_DIR=$HOME/boost_1_63_0
- SLIC3R_STATIC=1
after_success: after_success:
- cp slic3r ../
- LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64 - LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64
- package/linux/appimage.sh x86_64 - package/linux/appimage.sh x86_64
- package/deploy/sftp.sh linux ~/slic3r-upload.rsa *.bz2 Slic3r*.AppImage - package/deploy/sftp.sh linux ~/slic3r-upload.rsa *.bz2 Slic3r*.AppImage
@ -55,7 +56,6 @@ matrix:
env: env:
- WXVERSION=pkg - WXVERSION=pkg
- BOOST_DIR=$HOME/boost_1_63_0 - BOOST_DIR=$HOME/boost_1_63_0
- SLIC3R_STATIC=1
env: env:
global: global:
- secure: eEVRZNMv7FM6jrOU9iAFkDhWxFQ1WtHBEaObImcvtFUxy6vWSt3ehFFeTRouj3uHQAnbvUzziDyvPPm8/95alv5g/du8ML6YzzqKBKfazM0xQ7SF6R2DQL8lfFIp+RSV7T02byEP1f1g7Zva7xH9szIlDcSfU0pXW4KWbkBFMd8= - secure: eEVRZNMv7FM6jrOU9iAFkDhWxFQ1WtHBEaObImcvtFUxy6vWSt3ehFFeTRouj3uHQAnbvUzziDyvPPm8/95alv5g/du8ML6YzzqKBKfazM0xQ7SF6R2DQL8lfFIp+RSV7T02byEP1f1g7Zva7xH9szIlDcSfU0pXW4KWbkBFMd8=