OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: support dune-istl >= 2.5

Browse Source
This commit is contained in:
Arne Morten Kvarving
2018-01-02 11:50:30 +01:00
parent 32fded7590
commit e7a98b5e90
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/Modules/FindISTL.cmake
View File

@@ -3,6 +3,8 @@ find_package(PkgConfig)
set(OLD_PKG $ENV{PKG_CONFIG_PATH})
set(ENV{PKG_CONFIG_PATH} $ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig)
pkg_check_modules(ISTL dune-istl)
pkg_check_modules(ISTLc dune-common)
list(APPEND ISTL_LIBRARIES ${ISTLc_LIBRARIES})
set(ENV{PKG_CONFIG_PATH} ${OLD_PKG})
list(APPEND ISTL_DEFINITIONS -DHAVE_NULLPTR=1 -DISTL_VERSION="${ISTL_VERSION}")
@@ -18,16 +20,28 @@ endif()
if(SUPERLU_FOUND)
list(APPEND ISTL_DEFINITIONS -DHAVE_SUPERLU=1 -DSUPERLU_POST_2005_VERSION=1 -DSUPERLU_NTYPE=1 -DSUPERLU_MIN_VERSION_4_3=1)
if (HAVE_SUPERLU_5)
list(APPEND ISTL_DEFINITIONS -DSUPERLU_MIN_VERSION_5=1)
endif()
endif()
if(SuiteSparse_UMFPACK_FOUND AND ISTL_FOUND)
list(APPEND ISTL_DEFINITIONS -DHAVE_UMFPACK=1)
list(APPEND ISTL_DEFINITIONS -DHAVE_UMFPACK=1 -DHAVE_SUITESPARSE_UMFPACK=1)
list(APPEND ISTL_INCLUDE_DIRS ${UMFPACK_INCLUDE_DIR})
list(APPEND ISTL_LIBRARIES ${UMFPACK_LIBRARY})
endif()
list(APPEND ISTL_INCLUDE_DIRS ${ISTL_INCLUDEDIR})
if(DUNE_ISTL_VERSION_MAJOR GREATER 2 OR DUNE_ISTL_VERSION_MINOR GREATER 4)
if(NOT CXX_STD14_FLAGS)
message(STATUS dune-istl >= 2.5 requires c++14 support)
set(ISTL_LIBRARIES)
set(ISTL_DEFINITIONS)
set(ISTL_INCLUDE_DIRS)
endif()
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ISTL DEFAULT_MSG
ISTL_INCLUDE_DIRS ISTL_LIBRARIES)