fix eigen build on machine with system eigen + OPENSCAD_LIBRARIES without eigen

2 files changed, 10 insertions, 8 deletions

diff --git a/boost.pri b/boost.pri
index 284125e..2e8e3cb 100644
--- a/boost.pri
+++ b/boost.pri
@@ -16,12 +16,12 @@ boost {
     BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt
   } 
 
-  isEmpty($$BOOST_LINK_FLAGS):win32 {
+  isEmpty(BOOST_LINK_FLAGS):win32 {
     BOOST_LINK_FLAGS = -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
   } 
 
   # check for OPENSCAD_LIBDIR + multithread
-  isEmpty($$BOOST_LINK_FLAGS) {
+  isEmpty(BOOST_LINK_FLAGS) {
     OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
     !isEmpty($$OPENSCAD_LIBDIR) {
       exists($$OPENSCAD_LIBDIR/lib/libboost*thread-mt*) {
@@ -31,7 +31,7 @@ boost {
   }
 
   # check for BOOSTDIR + multithread
-  isEmpty($$BOOST_LINK_FLAGS) {
+  isEmpty(BOOST_LINK_FLAGS) {
     BOOST_DIR = $$(BOOSTDIR)
     !isEmpty($$BOOST_DIR) {
       exists($$BOOST_DIR/lib/libboost*thread-mt*) {
@@ -40,7 +40,7 @@ boost {
     }
   }
 
-  isEmpty($$BOOST_LINK_FLAGS) {
+  isEmpty(BOOST_LINK_FLAGS) {
     unix {
       BMT_TEST1 = /usr/lib64/libboost*thread-mt*
       BMT_TEST2 = /usr/lib/libboost*thread-mt*
@@ -50,7 +50,7 @@ boost {
     }
   }
 
-  isEmpty($$BOOST_LINK_FLAGS) {
+  isEmpty(BOOST_LINK_FLAGS) {
     unix|macx {
       BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options
     }
diff --git a/eigen2.pri b/eigen2.pri
index e188eaf..6be642e 100644
--- a/eigen2.pri
+++ b/eigen2.pri
@@ -7,9 +7,11 @@ eigen2 {
   # Optionally specify location of Eigen2 using the 
   # OPENSCAD_LIBRARIES env. variable
   isEmpty(EIGEN2_INCLUDEPATH) {
-    OPENSCAD_LIBRARIES_EIGEN2 = $$(OPENSCAD_LIBRARIES)
-    !isEmpty(OPENSCAD_LIBRARIES_EIGEN2) {
-      EIGEN2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_EIGEN2/include/eigen2
+    OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
+    !isEmpty(OPENSCAD_LIBRARIES_DIR) {
+      exists($$OPENSCAD_LIBRARIES_DIR/include/eigen2) {
+        EIGEN2_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen2
+      }
     }
   }