Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UMFPACK: Remove workaround for demos on POSIX platforms #529

Merged
merged 1 commit into from
Nov 26, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions UMFPACK/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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 ( )
Expand Down
Loading