Merge pull request #21 from dr-robertk/PR/fix-configure-zoltan

make configure work for ZOLTAN when used with dunecontrol.
This commit is contained in:
Andreas Lauser 2015-06-11 11:06:20 +02:00
commit 39b9e05420
2 changed files with 4 additions and 2 deletions

View File

@ -24,7 +24,7 @@ find_package(PTScotch)
find_path (ZOLTAN_INCLUDE_DIRS
NAMES "zoltan.h"
PATHS ${ZOLTAN_SEARCH_PATH}
PATH_SUFFIXES "include"
PATH_SUFFIXES "include"
${ZOLTAN_NO_DEFAULT_PATH})
# only search in architecture-relevant directory
@ -48,7 +48,7 @@ if (ZOLTAN_INCLUDE_DIRS OR ZOLTAN_LIBRARIES)
endif()
set (ZOLTAN_CONFIG_VAR HAVE_ZOLTAN)
# print a message to indicate status of this package
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args(ZOLTAN

View File

@ -48,6 +48,7 @@ Optional Packages:
--with-superlu=PATH user defined path to SuperLU library
--with-umfpack=PATH use UMFPACK/SuiteSparse from a specified location
--with-ert=PATH Use ERT libraries
--with-zoltan=PATH Use ZOLTAN libraries
--with-tinyxml=PATH use TinyXML library from a specified location
(Note: if not found, then a bundled library will
be used)
@ -265,6 +266,7 @@ for OPT in "$@"; do
opm-* |\
dune |\
dune-* |\
zoltan |\
zlib)
rootvar="$(uppercase ${pkgname})_ROOT"
rootvar="${rootvar/-/_}"