Try to fix detection of eigen3.

diff --git a/.appveyor.yml b/.appveyor.yml
index 644921a..974466c 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -57,7 +57,7 @@ before_build:
          ) else (echo Using cached Eigen3)
 
 build_script:
-- cmake -G "MinGW Makefiles" -Denable_documentation=OFF -Denable_java=ON -Denable_msg=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF -DEIGEN3_INCLUDE_DIR="C:\Program Files\Eigen\include\" .
+- cmake -G "MinGW Makefiles" -Denable_documentation=OFF -Denable_java=ON -Denable_msg=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
 - mingw32-make.exe VERBOSE=1 java-all python-bindings # Only the Java and Python parts
 - ctest --output-on-failure -R java
 - ctest --output-on-failure -R python

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 920f7f8..8777020 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,8 @@ find_package(Threads)
 
 ### Check for Eigen library
 find_package (Eigen3 3.3 REQUIRED NO_MODULE)
+message(STATUS "Found Eigen3: ${EIGEN3_INCLUDE_DIR}")
+include_directories(${EIGEN3_INCLUDE_DIR})
 
 ### Setup Options
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake)

diff --git a/src/kernel/lmm/bmf.cpp b/src/kernel/lmm/bmf.cpp
index 6ebcfc2..537e869 100644 (file)
--- a/src/kernel/lmm/bmf.cpp
+++ b/src/kernel/lmm/bmf.cpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/lmm/bmf.hpp"
-#include <eigen3/Eigen/LU>
+#include <Eigen/LU>
 #include <iostream>
 #include <numeric>
 #include <sstream>
@@ -483,4 +483,4 @@ template <class CnstList> void BmfSystem::bmf_solve(const CnstList& cnst_list)
 
 } // namespace lmm
 } // namespace kernel
-} // namespace simgrid
\ No newline at end of file
+} // namespace simgrid

diff --git a/src/kernel/lmm/bmf.hpp b/src/kernel/lmm/bmf.hpp
index 4ae56f9..5320a51 100644 (file)
--- a/src/kernel/lmm/bmf.hpp
+++ b/src/kernel/lmm/bmf.hpp
@@ -7,7 +7,7 @@
 #define SURF_BMF_HPP
 
 #include "src/kernel/lmm/maxmin.hpp"
-#include <eigen3/Eigen/Dense>
+#include <Eigen/Dense>
 #include <unordered_set>
 
 namespace simgrid {
@@ -267,4 +267,4 @@ private:
 } // namespace kernel
 } // namespace simgrid
 
-#endif
\ No newline at end of file
+#endif