Skip to content

Commit

Permalink
Merge pull request #7 from patrikhuber/fix-eigen-includes
Browse files Browse the repository at this point in the history
Fix eigen includes
  • Loading branch information
Dobiasd authored Feb 3, 2018
2 parents 149a2eb + 486e5fa commit 105aa72
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ install:
- make
- sudo make install
- cd ../..
- git clone https://github.com/RLovelett/eigen
- cd eigen
- git clone https://github.com/eigenteam/eigen-git-mirror
- cd eigen-git-mirror
- mkdir -p build && cd build
- cmake ..
- make
- sudo make install
- sudo ln -s /usr/local/include/eigen3/Eigen /usr/local/include/Eigen
- cd ../..
- git clone https://github.com/nlohmann/json
- cd json
Expand Down
2 changes: 1 addition & 1 deletion include/fdeep/common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#pragma warning( disable : 4706)
#pragma warning( disable : 4996)
#endif
#include <eigen3/Eigen/Dense>
#include <Eigen/Core>
#if defined _MSC_VER
#pragma warning( pop )
#endif
Expand Down

0 comments on commit 105aa72

Please sign in to comment.