Merge pull request #729 from andlaus/build_system_update
Build system update
This commit is contained in:
commit
4394a15f5e
@ -20,7 +20,7 @@ endif()
|
|||||||
find_path (METIS_INCLUDE_DIRS
|
find_path (METIS_INCLUDE_DIRS
|
||||||
NAMES "metis.h"
|
NAMES "metis.h"
|
||||||
PATHS ${METIS_SEARCH_PATH}
|
PATHS ${METIS_SEARCH_PATH}
|
||||||
PATH_SUFFIXES "include" "METISLib"
|
PATH_SUFFIXES "include" "METISLib" "include/metis"
|
||||||
${METIS_NO_DEFAULT_PATH})
|
${METIS_NO_DEFAULT_PATH})
|
||||||
|
|
||||||
# only search in architecture-relevant directory
|
# only search in architecture-relevant directory
|
||||||
@ -39,7 +39,7 @@ if (METIS_INCLUDE_DIRS OR METIS_LIBRARIES)
|
|||||||
set(METIS_FOUND TRUE)
|
set(METIS_FOUND TRUE)
|
||||||
set(HAVE_METIS TRUE)
|
set(HAVE_METIS TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# print a message to indicate status of this package
|
# print a message to indicate status of this package
|
||||||
include (FindPackageHandleStandardArgs)
|
include (FindPackageHandleStandardArgs)
|
||||||
find_package_handle_standard_args(METIS
|
find_package_handle_standard_args(METIS
|
||||||
|
51
cmake/Modules/FindZOLTAN.cmake
Normal file
51
cmake/Modules/FindZOLTAN.cmake
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
# -*-cmake-*-
|
||||||
|
#
|
||||||
|
# Try to find the libzoltan graph partioning library
|
||||||
|
#
|
||||||
|
# Once done, this will define:
|
||||||
|
#
|
||||||
|
# ZOLTAN_FOUND - system has the libzoltan graph partioning library
|
||||||
|
# HAVE_ZOLTAN - like ZOLTAN_FOUND, but for the inclusion in config.h
|
||||||
|
# ZOLTAN_INCLUDE_DIR - incude paths to use libzoltan
|
||||||
|
# ZOLTAN_LIBRARIES - Link these to use libzoltan
|
||||||
|
|
||||||
|
set(ZOLTAN_SEARCH_PATH "/usr" "/usr/local" "/opt" "/opt/local")
|
||||||
|
set(ZOLTAN_NO_DEFAULT_PATH "")
|
||||||
|
if(ZOLTAN_ROOT)
|
||||||
|
set(ZOLTAN_SEARCH_PATH "${ZOLTAN_ROOT}")
|
||||||
|
set(ZOLTAN_NO_DEFAULT_PATH "NO_DEFAULT_PATH")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# search for files which implements this module
|
||||||
|
find_path (ZOLTAN_INCLUDE_DIRS
|
||||||
|
NAMES "zoltan.h"
|
||||||
|
PATHS ${ZOLTAN_SEARCH_PATH}
|
||||||
|
PATH_SUFFIXES "include"
|
||||||
|
${ZOLTAN_NO_DEFAULT_PATH})
|
||||||
|
|
||||||
|
# only search in architecture-relevant directory
|
||||||
|
if (CMAKE_SIZEOF_VOID_P)
|
||||||
|
math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
|
||||||
|
endif (CMAKE_SIZEOF_VOID_P)
|
||||||
|
|
||||||
|
find_library(ZOLTAN_LIBRARIES
|
||||||
|
NAMES "zoltan"
|
||||||
|
PATHS ${ZOLTAN_SEARCH_PATH}
|
||||||
|
PATH_SUFFIXES "lib/.libs" "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
|
||||||
|
${ZOLTAN_NO_DEFAULT_PATH})
|
||||||
|
|
||||||
|
set (ZOLTAN_FOUND FALSE)
|
||||||
|
if (ZOLTAN_INCLUDE_DIRS OR ZOLTAN_LIBRARIES)
|
||||||
|
set(ZOLTAN_FOUND TRUE)
|
||||||
|
set(HAVE_ZOLTAN 1)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set (ZOLTAN_CONFIG_VAR HAVE_ZOLTAN)
|
||||||
|
|
||||||
|
# print a message to indicate status of this package
|
||||||
|
include (FindPackageHandleStandardArgs)
|
||||||
|
find_package_handle_standard_args(ZOLTAN
|
||||||
|
DEFAULT_MSG
|
||||||
|
ZOLTAN_LIBRARIES
|
||||||
|
ZOLTAN_INCLUDE_DIRS
|
||||||
|
)
|
@ -22,6 +22,7 @@ find_opm_package (
|
|||||||
"CXX11Features REQUIRED;
|
"CXX11Features REQUIRED;
|
||||||
dune-grid REQUIRED;
|
dune-grid REQUIRED;
|
||||||
ZLIB REQUIRED;
|
ZLIB REQUIRED;
|
||||||
|
ZOLTAN;
|
||||||
METIS
|
METIS
|
||||||
"
|
"
|
||||||
# header to search for
|
# header to search for
|
||||||
|
@ -1,10 +1,15 @@
|
|||||||
# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
|
# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
|
||||||
# vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
|
# vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
|
||||||
|
|
||||||
|
# this avoids an annoying deprecation warning on DUNE 2.4 (which we
|
||||||
|
# are not interested in anyway)
|
||||||
|
set(DUNE_AVOID_CAPABILITIES_IS_PARALLEL_DEPRECATION_WARNING 1)
|
||||||
|
|
||||||
# defines that must be present in config.h for our headers
|
# defines that must be present in config.h for our headers
|
||||||
set (ewoms_CONFIG_VAR
|
set (ewoms_CONFIG_VAR
|
||||||
HAVE_QUAD
|
HAVE_QUAD
|
||||||
HAVE_VALGRIND
|
HAVE_VALGRIND
|
||||||
|
DUNE_AVOID_CAPABILITIES_IS_PARALLEL_DEPRECATION_WARNING
|
||||||
)
|
)
|
||||||
|
|
||||||
# dependencies
|
# dependencies
|
||||||
|
Loading…
Reference in New Issue
Block a user