Skip to content

Commit b4197ac

Browse files
Merge pull request #529 from mmuetzel/umfpack
UMFPACK: Remove workaround for demos on POSIX platforms
2 parents a3adb97 + 38a8198 commit b4197ac

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

UMFPACK/CMakeLists.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -440,18 +440,6 @@ if ( DEMO )
440440
target_link_libraries ( umfpack_zl_demo PUBLIC UMFPACK_static )
441441
endif ( )
442442
target_link_libraries ( umfpack_simple PUBLIC SuiteSparse::SuiteSparseConfig )
443-
if ( NOT WIN32 )
444-
# This is only needed because the demos might be linked before those
445-
# libraries are installed. Would it be better to set the rpath instead?
446-
target_link_libraries ( umfpack_di_demo PUBLIC
447-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
448-
target_link_libraries ( umfpack_dl_demo PUBLIC
449-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
450-
target_link_libraries ( umfpack_zi_demo PUBLIC
451-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
452-
target_link_libraries ( umfpack_zl_demo PUBLIC
453-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
454-
endif ( )
455443
if ( NOT NFORTRAN )
456444
# Fortran demos
457445
if ( BUILD_SHARED_LIBS )
@@ -468,19 +456,6 @@ if ( DEMO )
468456
target_link_libraries ( umf4zhb64 PUBLIC UMFPACK_static )
469457
endif ( )
470458
target_link_libraries ( umf4 PUBLIC SuiteSparse::AMD )
471-
if ( NOT WIN32 )
472-
# This is only needed because the demos might be linked before
473-
# those libraries are installed. Would it be better to set the
474-
# rpath instead?
475-
target_link_libraries ( umf4hb PUBLIC
476-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
477-
target_link_libraries ( umf4zhb PUBLIC
478-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
479-
target_link_libraries ( umf4hb64 PUBLIC
480-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
481-
target_link_libraries ( umf4zhb64 PUBLIC
482-
SuiteSparse::COLAMD SuiteSparse::CAMD SuiteSparse::CCOLAMD )
483-
endif ( )
484459
endif ( )
485460

486461
else ( )

0 commit comments

Comments
 (0)