Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack

Conflicts: src/3rdParty/salomesmesh/CMakeLists.txt
2014-08-27 15:39:00 +02:00
parent 346e5c6a77 58a7be992b
commit c1f0f70b88
73 changed files with 12578 additions and 917 deletions
--- a/src/Mod/Mesh/App/Core/Approximation.cpp
+++ b/src/Mod/Mesh/App/Core/Approximation.cpp
@@ -53,9 +53,9 @@ namespace ublas = boost::numeric::ublas;
 extern "C" void LAPACK_DGESV (int const* n, int const* nrhs, 
                     double* a, int const* lda, int* ipiv, 
                     double* b, int const* ldb, int* info);
-#elif defined(FC_USE_EIGEN)
-# include <Eigen/LeastSquares>
+
 #endif
+
 # include <Eigen/LeastSquares>

 using namespace MeshCore;