make EIGEN2DIR prepend to -I not append. make boost MT detection use BOOSTDIR

1 files changed, 18 insertions, 20 deletions

diff --git a/boost.pri b/boost.pri
index 168e64c..42fe529 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
+    }
+  }
+
 }