diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-30 01:41:52 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-30 01:41:52 (GMT) |
| commit | 9259d57659f61e9e56942bb36125f605f8f3c338 (patch) | |
| tree | 7affbbd5f524887c715fc2ecc7e8a3aaacb55ac8 /scripts | |
| parent | 8c94c31dd2e5e85fc13d39fcd57b26df7afefe1e (diff) | |
| parent | f3b3eaac687f0ba9a2a9b9382e7b605f106bf2b0 (diff) | |
Merge branch 'master' into visitortests
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 0ed375f..f524d43 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -120,12 +120,13 @@ build_cgal() echo "Building CGAL" $version "..." cd $BASEDIR/src rm -rf CGAL* - curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz + curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz +# curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz # curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz tar xzf CGAL-$version.tar.gz cd CGAL-$version # We build a static lib. Not really necessary, but it's well tested. - cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DBUILD_SHARED_LIBS=FALSE -DCMAKE_OSX_DEPLOYMENT_TARGET="10.5" -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" -DBOOST_ROOT=$DEPLOYDIR + cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DGMP_INCLUDE_DIR=$DEPLOYDIR/include -DGMP_LIBRARIES=$DEPLOYDIR/lib/libgmp.dylib -DGMPXX_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_LIBRARIES=$DEPLOYDIR/lib/libmpfr.dylib -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DBUILD_SHARED_LIBS=FALSE -DCMAKE_OSX_DEPLOYMENT_TARGET="10.5" -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" -DBOOST_ROOT=$DEPLOYDIR make -j4 make install } @@ -165,6 +166,6 @@ build_gmp 5.0.1 build_mpfr 3.0.1 build_boost 1.47.0 # NB! For CGAL, also update the actual download URL in the function -build_cgal 3.8 +build_cgal 3.9 build_glew 1.6.0 build_opencsg 1.3.0 |