Commit 4494a3e8 authored by incardon's avatar incardon

Fixing compilation with EIGEN and PETSC

parent ddda7da8
...@@ -25,6 +25,7 @@ target_include_directories (numerics PUBLIC ${METIS_ROOT}/include) ...@@ -25,6 +25,7 @@ target_include_directories (numerics PUBLIC ${METIS_ROOT}/include)
target_include_directories (numerics PUBLIC ${HDF5_ROOT}/include) target_include_directories (numerics PUBLIC ${HDF5_ROOT}/include)
target_include_directories (numerics PUBLIC ${LIBHILBERT_INCLUDE_DIRS}) target_include_directories (numerics PUBLIC ${LIBHILBERT_INCLUDE_DIRS})
target_include_directories (numerics PUBLIC ${Boost_INCLUDE_DIRS}) target_include_directories (numerics PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories (numerics PUBLIC ${EIGEN3_INCLUDE_DIR})
target_link_libraries(numerics ${Boost_LIBRARIES}) target_link_libraries(numerics ${Boost_LIBRARIES})
target_link_libraries(numerics -L${PARMETIS_ROOT}/lib parmetis) target_link_libraries(numerics -L${PARMETIS_ROOT}/lib parmetis)
...@@ -32,7 +33,7 @@ target_link_libraries(numerics -L${METIS_ROOT}/lib metis) ...@@ -32,7 +33,7 @@ target_link_libraries(numerics -L${METIS_ROOT}/lib metis)
target_link_libraries(numerics -L${HDF5_ROOT}/lib hdf5 hdf5_hl) target_link_libraries(numerics -L${HDF5_ROOT}/lib hdf5 hdf5_hl)
target_link_libraries(numerics -L${LIBHILBERT_LIBRARY_DIRS} ${LIBHILBERT_LIBRARIES}) target_link_libraries(numerics -L${LIBHILBERT_LIBRARY_DIRS} ${LIBHILBERT_LIBRARIES})
if(PETSC_FOUND) if(PETSC_FOUND)
target_link_libraries(numerics -L${PETSC_LIB_DIR} ${PETSC_LIBRARIES}) target_link_libraries(numerics ${PETSC_LIBRARIES})
endif() endif()
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <petscvec.h> #include <petscvec.h>
#include "util/petsc_util.hpp" #include "util/petsc_util.hpp"
#include <unordered_map>
#define PETSC_RVAL 2 #define PETSC_RVAL 2
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
std::string msg("Petsc error: ");\ std::string msg("Petsc error: ");\
msg += std::string(__FILE__) + std::string(" ") + std::to_string(__LINE__);\ msg += std::string(__FILE__) + std::string(" ") + std::to_string(__LINE__);\
PetscInt ln = __LINE__;\ PetscInt ln = __LINE__;\
PetscError(MPI_COMM_WORLD,ln,__FUNCT__,__FILE__,err,PETSC_ERROR_INITIAL,"Error petsc");\ PetscError(MPI_COMM_WORLD,ln,__FUNCTION__,__FILE__,err,PETSC_ERROR_INITIAL,"Error petsc");\
}\ }\
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment