mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-07-30 05:51:59 +08:00
Build wx and cache the build dir instead of the installdir. Also add it to PATH so that wx-config will be found.
This commit is contained in:
parent
685ed01ac6
commit
3f77c838b8
@ -24,14 +24,16 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then
|
|||||||
elif [ $TRAVIS_OS_NAME == "osx" ]; then
|
elif [ $TRAVIS_OS_NAME == "osx" ]; then
|
||||||
WXVERSION=311
|
WXVERSION=311
|
||||||
export WXDIR=$HOME/wx${WXVERSION}
|
export WXDIR=$HOME/wx${WXVERSION}
|
||||||
if [ ! -e $CACHE/wx${WXVERSION}.tar.bz2 ]; then
|
if [ ! -e $CACHE/wx${WXVERSION}-${TRAVIS_OS_NAME}.tar.bz2 ]; then
|
||||||
curl -L "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2" -o $HOME/wx311-src.tar.bz2
|
curl -L "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2" -o $HOME/wx311-src.tar.bz2
|
||||||
tar -C$HOME -xjf $HOME/wx311-src.tar.bz2
|
tar -C$HOME -xjf $HOME/wx311-src.tar.bz2
|
||||||
mkdir $HOME/wxbuild-${WXVERSION}
|
mkdir $WXDIR
|
||||||
cd $HOME/wxbuild-${WXVERSION} && cmake $HOME/wxWidgets-3.1.1 -DwxBUILD_SHARED=off -DCMAKE_INSTALL_PREFIX=${WXDIR}
|
cd $HOME/$WXDIR && cmake $HOME/wxWidgets-3.1.1 -DwxBUILD_SHARED=OFF
|
||||||
cmake --build . --target install
|
cmake --build . --target -- -j4
|
||||||
tar -C$HOME -cjf $CACHE/wx${WXVERSION}.tar.bz2 $(basename ${WXDIR})
|
tar -C$HOME -cjf $CACHE/wx${WXVERSION}-${TRAVIS_OS_NAME}.tar.bz2 $(basename ${WXDIR})
|
||||||
else
|
else
|
||||||
tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
|
tar -C$HOME -xjf $CACHE/wx${WXVERSION}-${TRAVIS_OS_NAME}.tar.bz2
|
||||||
fi
|
fi
|
||||||
|
export PATH=${PATH}:${WXDIR}
|
||||||
|
cd $TRAVIS_BUILD_DIR # go back to the build dir
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user