From 38a81984375f3d734bd6f6e33c0f5d9c724b0c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Sat, 25 Nov 2023 13:10:30 +0100 Subject: [PATCH] UMFPACK: Remove workaround for demos on POSIX platforms It's no longer needed since we are linking to CMake targets instead of library names. --- UMFPACK/CMakeLists.txt | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/UMFPACK/CMakeLists.txt b/UMFPACK/CMakeLists.txt index 3e9d37258d..24e4af9f13 100644 --- a/UMFPACK/CMakeLists.txt +++ b/UMFPACK/CMakeLists.txt @@ -440,18 +440,6 @@ if ( DEMO ) target_link_libraries ( umfpack_zl_demo PUBLIC UMFPACK_static ) endif ( ) target_link_libraries ( umfpack_simple PUBLIC SuiteSparse::SuiteSparseConfig ) - if ( NOT WIN32 ) - # This is only needed because the demos might be linked before those - # libraries are installed. Would it be better to set the rpath instead? - target_link_libraries ( umfpack_di_demo PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - target_link_libraries ( umfpack_dl_demo PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - target_link_libraries ( umfpack_zi_demo PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - target_link_libraries ( umfpack_zl_demo PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - endif ( ) if ( NOT NFORTRAN ) # Fortran demos if ( BUILD_SHARED_LIBS ) @@ -468,19 +456,6 @@ if ( DEMO ) target_link_libraries ( umf4zhb64 PUBLIC UMFPACK_static ) endif ( ) target_link_libraries ( umf4 PUBLIC SuiteSparse::AMD ) - if ( NOT WIN32 ) - # This is only needed because the demos might be linked before - # those libraries are installed. Would it be better to set the - # rpath instead? - target_link_libraries ( umf4hb PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - target_link_libraries ( umf4zhb PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - target_link_libraries ( umf4hb64 PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - target_link_libraries ( umf4zhb64 PUBLIC - SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD ) - endif ( ) endif ( ) else ( )