From 663aed64adc325848f333fbd93cd3c619fe5c729 Mon Sep 17 00:00:00 2001 From: Niels Claes Date: Wed, 11 May 2022 15:00:57 +0200 Subject: [PATCH] hotfix: arpack should link properly after upstream changes --- setup_tools/findARPACK.cmake | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/setup_tools/findARPACK.cmake b/setup_tools/findARPACK.cmake index a67b0577..91e19a60 100644 --- a/setup_tools/findARPACK.cmake +++ b/setup_tools/findARPACK.cmake @@ -48,29 +48,19 @@ message(STATUS "Finding ARPACK") set(ARPACK_FOUND False) set(PARPACK_FOUND False) -if(DEFINED ENV{ARPACK_LIBRARIES}) - message(STATUS "ARPACK found: $ENV{ARPACK_LIBRARIES}") - set(ARPACK_FOUND True) - set(ARPACK_LIBRARIES $ENV{ARPACK_LIBRARIES}) - if(DEFINED ENV{PARPACK_LIBRARIES}) - message(STATUS "PARPACK found: $ENV{PARPACK_LIBRARIES}") - set(PARPACK_FOUND True) - set(PARPACK_LIBRARIES $ENV{PARPACK_LIBRARIES}) - endif() - return() -endif() - if (NOT DEFINED ENV{ARPACK_ROOT}) - message( - STATUS "Environment variable $ARPACK_ROOT not set, searching default locations" - ) + message(STATUS "Environment variable $ARPACK_ROOT not set!") + unable_to_find() + return() endif() # try to find ARPACK include dir find_path(ARPACK_INCLUDE_DIR NAMES arpackdef.h - HINTS $ENV{ARPACK_ROOT} - PATH_SUFFIXES include/arpack installed/include/arpack + HINTS $ENV{ARPACK_ROOT} $ENV{ARPACK_ROOT}/installed + PATH_SUFFIXES + include/arpack + include/arpack-ng ) if(ARPACK_INCLUDE_DIR) message(STATUS "Looking for ARPACK include directory - found")