diff options
Diffstat (limited to 'scripts/macosx-build-dependencies.sh')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 088d8b4..9cc0662 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -8,6 +8,7 @@ # # Usage: macosx-build-dependencies.sh [-6lcd] # -6 Build only 64-bit binaries +# -c Force use of LLVM compiler # -l Force use of LLVM compiler # -c Force use of clang compiler # -d Build for deployment (if not specified, e.g. Sparkle won't be built) @@ -17,6 +18,7 @@ # # FIXME: # o Verbose option +# o Force rebuild vs. only rebuild changes # BASEDIR=$PWD/../libraries @@ -238,8 +240,9 @@ build_cgal() cd $BASEDIR/src rm -rf CGAL-$version if [ ! -f CGAL-$version.tar.gz ]; then - # 4.1 - curl -O https://gforge.inria.fr/frs/download.php/31641/CGAL-$version.tar.gz + # 4.2 + curl -O https://gforge.inria.fr/frs/download.php/32359/CGAL-$version.tar.gz + # 4.1 curl -O https://gforge.inria.fr/frs/download.php/31641/CGAL-$version.tar.gz # 4.1-beta1 curl -O https://gforge.inria.fr/frs/download.php/31348/CGAL-$version.tar.gz # 4.0.2 curl -O https://gforge.inria.fr/frs/download.php/31175/CGAL-$version.tar.gz # 4.0 curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz @@ -306,7 +309,9 @@ build_eigen() EIGENDIR="none" if [ $version = "2.0.17" ]; then EIGENDIR=eigen-eigen-b23437e61a07; fi - if [ $version = "3.1.2" ]; then EIGENDIR=eigen-eigen-5097c01bcdc4; fi + if [ $version = "3.1.2" ]; then EIGENDIR=eigen-eigen-5097c01bcdc4; + elif [ $version = "3.1.3" ]; then EIGENDIR=eigen-eigen-2249f9c22fe8; fi + if [ $EIGENDIR = "none" ]; then echo Unknown eigen version. Please edit script. exit 1 @@ -389,7 +394,7 @@ elif $OPTION_GCC; then elif $OPTION_CLANG; then USING_CLANG=true elif (( $OSX_VERSION >= 7 )); then - USING_GCC=true + USING_CLANG=true fi if $USING_LLVM; then @@ -435,12 +440,13 @@ fi echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_qt 4.8.4 -build_eigen 3.1.2 -build_gmp 5.1.1 +# NB! For eigen, also update the path in the function +build_eigen 3.1.3 +build_gmp 5.1.2 build_mpfr 3.1.2 build_boost 1.53.0 # NB! For CGAL, also update the actual download URL in the function -build_cgal 4.1 +build_cgal 4.2 build_glew 1.9.0 build_opencsg 1.3.2 if $OPTION_DEPLOY; then |