Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 15 insertions, 0 deletions

diff --git a/eigen.pri b/eigen.pri
index 5adac4b..5935a47 100644
--- a/eigen.pri
+++ b/eigen.pri
@@ -59,6 +59,21 @@ isEmpty(EIGEN_INCLUDEPATH) {
   }
 }
 
+!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
+  EIGEN_CFLAGS = $$system("pkg-config --cflags eigen2")
+  EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
+}
+
+!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
+  EIGEN_CFLAGS = $$system("pkg-config --cflags eigen3")
+  EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
+}
+
+mingw-cross-env {
+  EIGEN_CFLAGS = $$system("i686-pc-mingw32-pkg-config --cflags eigen3")
+  EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
+}
+
 # disable Eigen SIMD optimizations for platforms where it breaks compilation
 !macx {
   !freebsd-g++ {