From 83cc0e2714415e57b06c1ab26d3e4d9f78b628e7 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 7 Mar 2022 14:42:40 +0100 Subject: [PATCH] Try to fix detection of eigen3. --- .appveyor.yml | 2 +- CMakeLists.txt | 2 ++ src/kernel/lmm/bmf.cpp | 4 ++-- src/kernel/lmm/bmf.hpp | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 644921a180..974466ca11 100644 --- 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 920f7f8f5e..87770205e8 100644 --- 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 6ebcfc2bd7..537e8692e5 100644 --- 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 +#include #include #include #include @@ -483,4 +483,4 @@ template 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 4ae56f9fb1..5320a519a5 100644 --- 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 +#include #include namespace simgrid { @@ -267,4 +267,4 @@ private: } // namespace kernel } // namespace simgrid -#endif \ No newline at end of file +#endif -- 2.20.1