yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Bruno Chareyre (bruno-chareyre)
------------------------------------------------------------
revno: 3433 [merge]
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Mon 2014-06-23 18:33:41 +0200
message:
  Merge github.com:yade/trunk into chaoUnsat
modified:
  CMakeLists.txt
  doc/sphinx/installation.rst


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-20 15:28:21 +0000
+++ CMakeLists.txt	2014-06-23 16:21:06 +0000
@@ -134,9 +134,9 @@
   INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
   MESSAGE(STATUS "Found Eigen3, version: ${EIGEN3_VERSION}")
   
-  # Minimal required version 3.2.1
+  # Minimal recommended version 3.2.1
   IF ((${EIGEN3_MAJOR_VERSION} LESS 2) OR ((${EIGEN3_MAJOR_VERSION} EQUAL 2) AND (${EIGEN3_MINOR_VERSION} LESS 1)))
-    MESSAGE(FATAL_ERROR "Minimal required Eigen3 version is 3.2.1, please update Eigen3!")
+    MESSAGE(WARNING "Minimal recommended Eigen3 version is 3.2.1")
   ENDIF ((${EIGEN3_MAJOR_VERSION} LESS 2) OR ((${EIGEN3_MAJOR_VERSION} EQUAL 2) AND (${EIGEN3_MINOR_VERSION} LESS 1)))
 
   SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} Eigen3")

=== modified file 'doc/sphinx/installation.rst'
--- doc/sphinx/installation.rst	2014-06-19 15:35:52 +0000
+++ doc/sphinx/installation.rst	2014-06-23 16:21:06 +0000
@@ -115,7 +115,7 @@
 * `libQGLViewer <http://www.libqglviewer.com>`_
 * `python <http://www.python.org>`_, `numpy <http://numpy.scipy.org>`_, `ipython <http://ipython.scipy.org>`_
 * `matplotlib <http://matplotlib.sf.net>`_
-* `eigen3 <http://eigen.tuxfamily.org>`_ algebra library (minimal required version 3.2.1)
+* `eigen3 <http://eigen.tuxfamily.org>`_ algebra library (minimal recommended version 3.2.1)
 * `gdb <http://www.gnu.org/software/gdb>`_ debugger
 * `sqlite3 <http://www.sqlite.org>`_ database engine
 * `Loki <http://loki-lib.sf.net>`_ library