diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-20 19:36:17 (GMT) | 
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-20 19:36:17 (GMT) | 
| commit | eda7a413351aabedfbf115ae336b2b610844953e (patch) | |
| tree | 54d7e6dfccef42ac96e6f0801310e0caa70fdb8d /scripts | |
| parent | 821c064f3e6d624152b49f2297b750bdc53f3a5f (diff) | |
cgal 4.0.2 has a bugfix re clang and gcc 4.7 ( issue #117 )
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 7 | ||||
| -rw-r--r-- | scripts/setenv-linbuild.sh | 4 | 
2 files changed, 6 insertions, 5 deletions
| diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index 36dc2ee..7d47c66 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -129,13 +129,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 | 
