diff options
| author | Marius Kintel <marius@kintel.net> | 2013-11-15 20:48:43 (GMT) | 
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-11-15 20:48:43 (GMT) | 
| commit | 3e3caaa62500431b047072d3ecf1e5e3fdd7e502 (patch) | |
| tree | 77fdcd8e815276eaab43ef7047abc93ee4c0c2c8 /scripts | |
| parent | 022f80e87b1df5af489414a01bf2b5bcef1c3acd (diff) | |
Removed eigen2 from build system and documentation. We now require eigen3
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-dependencies.sh | 2 | ||||
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 1 | ||||
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 7 | ||||
| -rwxr-xr-x | scripts/uni-get-dependencies.sh | 2 | 
4 files changed, 2 insertions, 10 deletions
| diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index 120aed9..b63c677 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -472,7 +472,7 @@ check_old_local()  {    warnon=    if [ "`uname | grep -i linux`" ]; then -    header_list="opencsg.h CGAL boost GL/glew.h gmp.h mpfr.h eigen2 eigen3" +    header_list="opencsg.h CGAL boost GL/glew.h gmp.h mpfr.h eigen3"      for i in $header_list; do        if [ -e /usr/local/include/$i ]; then          echo "Warning: you have a copy of "$i" under /usr/local/include" diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index d1c5985..19c9709 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -309,7 +309,6 @@ build_eigen()    rm -rf eigen-$version    EIGENDIR="none" -  if [ $version = "2.0.17" ]; then EIGENDIR=eigen-eigen-b23437e61a07; fi    if [ $version = "3.1.2" ]; then EIGENDIR=eigen-eigen-5097c01bcdc4;    elif [ $version = "3.1.3" ]; then EIGENDIR=eigen-eigen-2249f9c22fe8;    elif [ $version = "3.1.4" ]; then EIGENDIR=eigen-eigen-36bf2ceaf8f5; diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 620c705..e652c47 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -476,12 +476,6 @@ build_opencsg()  build_eigen()  {    version=$1 -  if [ -e $DEPLOYDIR/include/eigen2 ]; then -    if [ `echo $version | grep 2....` ]; then -      echo "Eigen2 already installed. not building" -      return -    fi -  fi    if [ -e $DEPLOYDIR/include/eigen3 ]; then      if [ `echo $version | grep 3....` ]; then        echo "Eigen3 already installed. not building" @@ -492,7 +486,6 @@ build_eigen()    cd $BASEDIR/src    rm -rf eigen-$version    EIGENDIR="none" -  if [ $version = "2.0.17" ]; then EIGENDIR=eigen-eigen-b23437e61a07; fi    if [ $version = "3.1.1" ]; then EIGENDIR=eigen-eigen-43d9075b23ef; fi    if [ $EIGENDIR = "none" ]; then      echo Unknown eigen version. Please edit script. diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh index 8e0b9d3..a0306ef 100755 --- a/scripts/uni-get-dependencies.sh +++ b/scripts/uni-get-dependencies.sh @@ -57,7 +57,7 @@ get_debian_deps()  {   for pkg in build-essential libqt4-dev libqt4-opengl-dev \    libxmu-dev cmake bison flex git-core libboost-all-dev \ -  libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev \ +  libXi-dev libmpfr-dev libboost-dev libglew-dev \    libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev \    python-paramiko curl imagemagick; do     sudo apt-get -y install $pkg; | 
