From 60ac7e4cb80241834ca159e9aaf17208e79ec919 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 13 Oct 2015 16:38:35 -0300 Subject: [PATCH] Sketcher's GCS solver fixed for eigen3.3 --- src/Mod/Sketcher/App/planegcs/GCS.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Mod/Sketcher/App/planegcs/GCS.cpp b/src/Mod/Sketcher/App/planegcs/GCS.cpp index 5df8e74062..7de4aeda2f 100644 --- a/src/Mod/Sketcher/App/planegcs/GCS.cpp +++ b/src/Mod/Sketcher/App/planegcs/GCS.cpp @@ -30,14 +30,17 @@ // NOTE: In CMakeList.txt -DEIGEN_NO_DEBUG is set (it does not work with a define here), to solve this: // this is needed to fix this SparseQR crash http://forum.freecadweb.org/viewtopic.php?f=10&t=11341&p=92146#p92146, // until Eigen library fixes its own problem with the assertion (definitely not solved in 3.2.0 branch) +// NOTE2: solved in eigen3.3 #define EIGEN_VERSION (EIGEN_WORLD_VERSION * 10000 \ + EIGEN_MAJOR_VERSION * 100 \ + EIGEN_MINOR_VERSION) #if EIGEN_VERSION >= 30202 +#if EIGEN_VERSION < 30290 // this is eigen3.3. Bad numbering? This should be safe anyway. #define EIGEN_SPARSEQR_COMPATIBLE #endif +#endif //#undef EIGEN_SPARSEQR_COMPATIBLE