From: Denis Davydov Date: Wed, 30 Mar 2016 13:44:07 +0000 (+0200) Subject: clean-up ParMetis from CMake config system X-Git-Tag: v8.5.0-rc1~1154^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dcdac1296f0cba69cd0ab9b533040b186515e41;p=dealii.git clean-up ParMetis from CMake config system --- diff --git a/cmake/modules/FindMETIS.cmake b/cmake/modules/FindMETIS.cmake index e6d4ecc13f..ec6e9a2d6a 100644 --- a/cmake/modules/FindMETIS.cmake +++ b/cmake/modules/FindMETIS.cmake @@ -45,21 +45,6 @@ DEAL_II_FIND_LIBRARY(METIS_LIBRARY build/${CMAKE_CXX_PLATFORM_ID}-${CMAKE_SYSTEM_PROCESSOR}/libmetis ) -# -# Sanity check: Only search the parmetis library in the same directory as -# the metis library... -# -GET_FILENAME_COMPONENT(_path "${METIS_LIBRARY}" PATH) -DEAL_II_FIND_LIBRARY(PARMETIS_LIBRARY - NAMES parmetis - HINTS ${_path} - NO_DEFAULT_PATH - NO_CMAKE_ENVIRONMENT_PATH - NO_CMAKE_PATH - NO_SYSTEM_ENVIRONMENT_PATH - NO_CMAKE_SYSTEM_PATH - NO_CMAKE_FIND_ROOT_PATH - ) DEAL_II_FIND_PATH(METIS_INCLUDE_DIR metis.h HINTS ${METIS_DIR} @@ -98,12 +83,11 @@ ENDIF() DEAL_II_PACKAGE_HANDLE(METIS LIBRARIES - OPTIONAL PARMETIS_LIBRARY REQUIRED METIS_LIBRARY OPTIONAL MPI_C_LIBRARIES INCLUDE_DIRS REQUIRED METIS_INCLUDE_DIR USER_INCLUDE_DIRS REQUIRED METIS_INCLUDE_DIR - CLEAR METIS_LIBRARY PARMETIS_LIBRARY METIS_INCLUDE_DIR + CLEAR METIS_LIBRARY METIS_INCLUDE_DIR )