Fix OpenGL linking; fix dependencies on OSX 10.12

This commit is contained in:
Alessandro Ranellucci 2018-11-10 13:02:39 +01:00
parent 7204144046
commit b54dd26557

View File

@ -2,6 +2,11 @@
set -euo pipefail set -euo pipefail
brew update -v brew update -v
# These two commands are only needed on 10.12:
rm -rf /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask
brew uninstall --force postgis cgal sfcgal
brew install boost || brew upgrade boost brew install boost || brew upgrade boost
brew install perl || brew upgrade perl brew install perl || brew upgrade perl
brew install cpanminus || brew upgrade cpanminus brew install cpanminus || brew upgrade cpanminus
@ -12,7 +17,17 @@ export SLIC3R_STATIC=1
export BOOST_DIR=/usr/local export BOOST_DIR=/usr/local
perl ./Build.PL perl ./Build.PL
# remove X11 because otherwise OpenGL.pm will link libglut.3.dylib instead of GLUT.framework
sudo rm -rf /opt/X11*
cpanm --local-lib local-lib --reinstall OpenGL # this updates the cache, remove it after one commit
export LIBRARY_PATH=/usr/local/lib export LIBRARY_PATH=/usr/local/lib
# One Wx test fails on 10.12; seems harmless
if [ $TRAVIS_OSX_IMAGE == 'xcode9.2']; then
cpanm --local-lib local-lib -f Wx
fi
perl ./Build.PL --gui perl ./Build.PL --gui
# Install PAR::Packer now so that it gets cached by Travis # Install PAR::Packer now so that it gets cached by Travis