Removed eigen2 from build system and documentation. We now require eigen3

8 files changed, 9 insertions, 38 deletions

diff --git a/README.md b/README.md
index c22871a..27f12ce 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ Follow the instructions for the platform you're compiling on below.
  * [boost (1.35 - 1.53)](http://www.boost.org/)
 * [OpenCSG (1.3.2)](http://www.opencsg.org/)
 * [GLEW (1.5.4 ->)](http://glew.sourceforge.net/)
-* [Eigen (2.0.x->3.x)](http://eigen.tuxfamily.org/)
+* [Eigen (3.0 - 3.2)](http://eigen.tuxfamily.org/)
 * [GCC C++ Compiler (4.2 ->)](http://gcc.gnu.org/)
 * [Bison (2.4)](http://www.gnu.org/software/bison/)
 * [Flex (2.5.35)](http://flex.sourceforge.net/)
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;
diff --git a/src/AboutDialog.html b/src/AboutDialog.html
index b5a5d7c..99e7c3b 100644
--- a/src/AboutDialog.html
+++ b/src/AboutDialog.html
@@ -47,7 +47,7 @@ Please visit this link for a copy of the license: <a href="http://www.gnu.org/li
 <li><a href="http://gmplib.org/">GNU GMP</a>
 <li><a href="http://www.mpfr.org/">GNU MPFR</a>
 <li><a href="http://www.cgal.org">CGAL</a>
-<li><a href="http://eigen.tuxfamily.org">Eigen2</a>
+<li><a href="http://eigen.tuxfamily.org">Eigen</a>
 <li><a href="http://www.opencsg.org">OpenCSG</a>
 <li><a href="http://www.opengl.org/">OpenGL</a>
 <li><a href="http://glew.sourceforge.net">GLEW</a>
diff --git a/src/version_check.h b/src/version_check.h
index 6e07208..86e769c 100644
--- a/src/version_check.h
+++ b/src/version_check.h
@@ -35,8 +35,8 @@ a time, to avoid confusion.
 
 
 #include <Eigen/Core>
-#if not EIGEN_VERSION_AT_LEAST( 2,0,13 )
-#error eigen2 library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
+#if not EIGEN_VERSION_AT_LEAST( 3,0,0 )
+#error eigen library missing or version too old. See README.md. To force compile, run qmake CONFIG+=skip-version-check
 #else
 
 
@@ -104,7 +104,7 @@ a time, to avoid confusion.
 #endif // ENABLE_CGAL
 
 #endif // Boost
-#endif // Eigen2
+#endif // Eigen
 #endif // MPFR
 #endif // GMP
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6aff17b..4be8245 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -212,30 +212,21 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 endif()
 
 # Priority
-# 3. EIGENDIR if set (EIGEN2DIR for backwards compatability)
+# 3. EIGENDIR if set
 # 1. OPENSCAD_LIBRARIES eigen3
-# 2. OPENSCAD_LIBRARIES eigen2
 # 4. system's standard include paths for eigen3
-# 5. system's standard include paths for eigen2
 
-set(EIGEN2_DIR "$ENV{EIGEN2DIR}")
 set(EIGEN_DIR "$ENV{EIGENDIR}")
 set(OPENSCAD_LIBDIR "$ENV{OPENSCAD_LIBRARIES}")
 
 if (EIGEN_DIR)
-  set(EIGHINT ${EIGEN_DIR}/include/eigen3 ${EIGEN_DIR}/include/eigen2 ${EIGEN_DIR})
+  set(EIGHINT ${EIGEN_DIR}/include/eigen3 ${EIGEN_DIR})
   find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${EIGHINT})
 endif()
-if (EIGEN2_DIR)
-  find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${EIGEN2_DIR}/include/eigen2 ${EIGEN2_DIR})
-endif()
 
 if (NOT EIGEN_INCLUDE_DIR)
   find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${OPENSCAD_LIBDIR}/include/eigen3)
 endif()
-if (NOT EIGEN_INCLUDE_DIR)
-  find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${OPENSCAD_LIBDIR}/include/eigen2)
-endif()
 
 if (NOT EIGEN_INCLUDE_DIR)
   if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -250,18 +241,6 @@ if (NOT EIGEN_INCLUDE_DIR)
 endif()
 
 if (NOT EIGEN_INCLUDE_DIR)
-  if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /usr/local/include/eigen2)
-  elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-    find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /usr/pkg/include/eigen2)
-  elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /opt/local/include/eigen2)
-  else()
-    find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /usr/include/eigen2)
-  endif()
-endif()
-
-if (NOT EIGEN_INCLUDE_DIR)
   message(STATUS "Eigen not found")
 else()
   message(STATUS "Eigen found in " ${EIGEN_INCLUDE_DIR})