diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-21 02:32:31 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-21 02:32:31 (GMT) |
| commit | ec01e7f492cb750221464dc09d8d3e3d18607d18 (patch) | |
| tree | 524c9913eb4e9853b66ab3d0f500c8d99856abd4 | |
| parent | 924c9ccc1f0838cd89d2428bd50caf2540a6d831 (diff) | |
| parent | eda7a413351aabedfbf115ae336b2b610844953e (diff) | |
Merge branch 'cgal402' of github.com:openscad/openscad into clang
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 7 | ||||
| -rw-r--r-- | scripts/setenv-linbuild.sh | 4 | ||||
| -rw-r--r-- | src/version_check.h | 2 |
4 files changed, 8 insertions, 7 deletions
@@ -85,7 +85,7 @@ are build scripts that download and compile the libraries from source. Follow the instructions for the platform you're compiling on below. * [Qt4 (4.4 - 4.7)](http://www.qt.nokia.com/) -* [CGAL (3.6 - 3.9)](http://www.cgal.org/) +* [CGAL (3.6 - 4.0.2)](http://www.cgal.org/) * [GMP (5.0.x)](http://www.gmplib.org/) * [cmake (2.6 - 2.8, required by CGAL and the test framework)](http://www.cmake.org/) * [MPFR (3.x)](http://www.mpfr.org/) diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index c21db09..be27d2a 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -136,13 +136,14 @@ build_cgal() cd $BASEDIR/src rm -rf CGAL-$version if [ ! -f CGAL-$version.tar.gz ]; then - #4.0 - curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz + #4.0.2 + curl -O https://gforge.inria.fr/frs/download.php/31174/CGAL-$version.tar.bz2 + # 4.0 curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz # 3.9 curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz # 3.8 curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz # 3.7 curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz fi - tar xzf CGAL-$version.tar.gz + tar jxf CGAL-$version.tar.bz2 cd CGAL-$version if [ $2 = use-sys-libs ]; then cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DCMAKE_BUILD_TYPE=Debug diff --git a/scripts/setenv-linbuild.sh b/scripts/setenv-linbuild.sh index 6361dd4..338cac9 100644 --- a/scripts/setenv-linbuild.sh +++ b/scripts/setenv-linbuild.sh @@ -3,9 +3,9 @@ # run this file with 'source setenv-linbuild.sh' every time you re-login # and want to build or run openscad against custom libraries installed -# into BASEDIR. +# into BASEDIR. -# copy this file to your .bashrc if desired. +# copy this file to your .bashrc if desired. if [ ! $BASEDIR ]; then BASEDIR=$HOME/openscad_deps diff --git a/src/version_check.h b/src/version_check.h index 4d10b0b..8e131be 100644 --- a/src/version_check.h +++ b/src/version_check.h @@ -53,7 +53,7 @@ a time, to avoid confusion. #error CGAL library missing or version too old. See README.md. To force compile, run qmake CONFIG=skip-version-check #else -#if CGAL_VERSION_NR < 1040001000 +#if CGAL_VERSION_NR < 1040021000 #warning "=======================" #warning "." #warning "." |