From 6bccf5be43af0947103cdd6ebac5a30615f55c84 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Fri, 16 Dec 2011 21:51:07 -0600
Subject: [PATCH] make EIGEN2DIR prepend to -I not append. make boost MT
 detection use BOOSTDIR

---
 boost.pri  | 38 ++++++++++++++++++--------------------
 eigen2.pri | 15 +++++++++------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/boost.pri b/boost.pri
index 168e64cd..42fe5295 100644
--- a/boost.pri
+++ b/boost.pri
@@ -9,34 +9,32 @@ boost {
     win32:QMAKE_LIBDIR += -L$$BOOST_DIR/lib
   }
 
-  ORIGINAL_LIBS_VALUE = $$LIBS
-
-  win32 {
+  win32:!CONFIG(mingw-cross-env) {
     LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
-  }
-
-  exists(/usr/lib64/libboost*thread-mt*) {
-    LIBS += -lboost_thread-mt -lboost_program_options-mt
-    BOOST_IS_MT = true
   } 
 
-  exists(/usr/lib/libboost*thread-mt*) {
-    LIBS *= -lboost_thread-mt -lboost_program_options-mt
-    BOOST_IS_MT = true
-  } 
-
-  isEmpty(BOOST_IS_MT) { 
-    unix|macx {
-      LIBS += -lboost_thread -lboost_program_options
-    }
-  }
-
   CONFIG(mingw-cross-env) {
-    LIBS = $$ORIGINAL_LIBS_VALUE # erase, start over
     DEFINES += BOOST_STATIC
     DEFINES += BOOST_THREAD_USE_LIB
     DEFINES += Boost_USE_STATIC_LIBS
     LIBS += -lboost_thread_win32-mt -lboost_program_options-mt
   } 
 
+  unix* {
+    BMT_TEST1 = /usr/lib64/libboost*thread-mt*
+    BMT_TEST2 = /usr/lib/libboost*thread-mt*
+    BMT_TEST3 = $$BOOST_DIR/lib/libboost*thread-mt*
+
+    exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3) {
+      LIBS += -lboost_thread-mt -lboost_program_options-mt
+      BOOST_IS_MT = true
+    } 
+  }
+
+  unix*|macx {
+    isEmpty(BOOST_IS_MT) { 
+      LIBS += -lboost_thread -lboost_program_options
+    }
+  }
+
 }
diff --git a/eigen2.pri b/eigen2.pri
index 8b955e39..3d7017b7 100644
--- a/eigen2.pri
+++ b/eigen2.pri
@@ -3,19 +3,22 @@ eigen2 {
   # EIGEN2DIR env. variable
   EIGEN2_DIR = $$(EIGEN2DIR)
   !isEmpty(EIGEN2_DIR) {
-    INCLUDEPATH += $$EIGEN2_DIR
+    EIGEN2_INCLUDEPATH = $$EIGEN2_DIR
   }
   else {
     CONFIG(mingw-cross-env) {
-      INCLUDEPATH += mingw-cross-env/include/eigen2
+      EIGEN2_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
+      freebsd-g++: EIGEN2_INCLUDEPATH *= /usr/local/include/eigen2
+      macx: EIGEN2_INCLUDEPATH *= /opt/local/include/eigen2
+      !macx:!freebsd-g++:EIGEN2_INCLUDEPATH *= /usr/include/eigen2
     }
   }
 
-  # disable Eigen SIMD optimizations for non-Mac OSX
+  # 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