Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #670 from vigsterkr/master
Use the supplied pkg-config script to detect eigen
  • Loading branch information
lisitsyn committed Jul 24, 2012
2 parents ee6b9c2 + ef423ad commit e37e6fe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions src/configure
Expand Up @@ -3385,17 +3385,12 @@ check_eigen3()
{
if test "$_eigen3" = yes || test "$_eigen3" = auto
then
cat > $TMPCXX << EOF
#include <eigen3/Eigen/Dense>
int main(int argc, char **argv)
{
return 0;
}
EOF
echocheck "Eigen3 support"
if cxx_check
if pkg-config --exists eigen3
then
echores "yes"
EIGEN3_CFLAGS=`pkg-config --cflags eigen3`
INCLUDES="$INCLUDES $EIGEN3_CFLAGS"
HAVE_EIGEN3='#define HAVE_EIGEN3 1'
DEFINES="$DEFINES -DHAVE_EIGEN3"
else
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/mathematics/Math.h
Expand Up @@ -38,7 +38,7 @@

#ifdef HAVE_EIGEN3
#define EIGEN_RUNTIME_NO_MALLOC
#include <eigen3/Eigen/Dense>
#include <Eigen/Dense>
#endif

/// workaround for log2 being a define on cygwin
Expand Down

0 comments on commit e37e6fe

Please sign in to comment.