From 9bd00793518c841e06570993cc2b97fe1b43017e Mon Sep 17 00:00:00 2001 From: maier Date: Sun, 23 Sep 2012 16:27:03 +0000 Subject: [PATCH] Bugfix: Only try to extract the metis version number out of a file if it is actually found. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26644 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindMETIS.cmake | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index a1dc23ed5a..ac25f0c713 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -13,21 +13,20 @@ FIND_LIBRARY(METIS_LIBRARY PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib ) -# -# Extract the version number out of metis.h -# -FILE(STRINGS "${METIS_INCLUDE_DIR}/metis.h" METIS_MAJOR_STRING - REGEX "METIS_VER_MAJOR") -STRING(REGEX REPLACE "^.*METIS_VER_MAJOR.* ([0-9]+).*" "\\1" METIS_MAJOR "${METIS_MAJOR_STRING}") - -FILE(STRINGS "${METIS_INCLUDE_DIR}/metis.h" METIS_MINOR_STRING - REGEX "METIS_VER_MINOR") -STRING(REGEX REPLACE "^.*METIS_VER_MINOR.* ([0-9]+).*" "\\1" METIS_MINOR "${METIS_MINOR_STRING}") - - FIND_PACKAGE_HANDLE_STANDARD_ARGS(METIS DEFAULT_MSG METIS_LIBRARY METIS_INCLUDE_DIR) IF(METIS_FOUND) + # + # Extract the version number out of metis.h + # + FILE(STRINGS "${METIS_INCLUDE_DIR}/metis.h" METIS_MAJOR_STRING + REGEX "METIS_VER_MAJOR") + STRING(REGEX REPLACE "^.*METIS_VER_MAJOR.* ([0-9]+).*" "\\1" METIS_MAJOR "${METIS_MAJOR_STRING}") + + FILE(STRINGS "${METIS_INCLUDE_DIR}/metis.h" METIS_MINOR_STRING + REGEX "METIS_VER_MINOR") + STRING(REGEX REPLACE "^.*METIS_VER_MINOR.* ([0-9]+).*" "\\1" METIS_MINOR "${METIS_MINOR_STRING}") + MARK_AS_ADVANCED( METIS_LIBRARY METIS_INCLUDE_DIR -- 2.39.5