Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	tests/CMakeLists.txt

1 files changed, 25 insertions, 13 deletions

diff --git a/eigen2.pri b/eigen2.pri
index 4c71749..44649f8 100644
--- a/eigen2.pri
+++ b/eigen2.pri
@@ -1,15 +1,27 @@
-# Optionally specify location of Eigen2 using the 
-# EIGEN2DIR env. variable
-EIGEN2_DIR = $$(EIGEN2DIR)
-!isEmpty(EIGEN2_DIR) {
-  INCLUDEPATH += $$EIGEN2_DIR
-}
-else {
-  CONFIG(mingw-cross-env) {
-    INCLUDEPATH += mingw-cross-env/include/eigen2
-  } else {
-    freebsd-g++: INCLUDEPATH += /usr/local/include/eigen2
-    macx: INCLUDEPATH += /opt/local/include/eigen2
-    !macx:!freebsd-g++:INCLUDEPATH += /usr/include/eigen2
+eigen2 {
+  # Optionally specify location of Eigen2 using the 
+  # EIGEN2DIR env. variable
+  EIGEN2_DIR = $$(EIGEN2DIR)
+  !isEmpty(EIGEN2_DIR) {
+    EIGEN2_INCLUDEPATH = $$EIGEN2_DIR
+  }
+  else {
+    CONFIG(mingw-cross-env) {
+      EIGEN2_INCLUDEPATH = mingw-cross-env/include/eigen2
+    } else {
+      freebsd-g++: EIGEN2_INCLUDEPATH *= /usr/local/include/eigen2
+      macx: EIGEN2_INCLUDEPATH *= /opt/local/include/eigen2
+      !macx:!freebsd-g++:!win32:EIGEN2_INCLUDEPATH *= /usr/include/eigen2
+    }
+  }
+
+  # eigen2 being under 'include/eigen2' needs special prepending
+  QMAKE_INCDIR_QT = $$EIGEN2_INCLUDEPATH $$QMAKE_INCDIR_QT
+
+  # disable Eigen SIMD optimizations for platforms where it breaks compilation
+  !macx {
+    !freebsd-g++ {
+      QMAKE_CXXFLAGS += -DEIGEN_DONT_ALIGN
+    }
   }
 }