On Wed, 2010-08-11 at 12:17 +0000, nore...@launchpad.net wrote: > ------------------------------------------------------------ > revno: 4946 > committer: Johannes Ring <joha...@simula.no> > branch nick: dolfin > timestamp: Wed 2010-08-11 14:15:07 +0200 > message: > Re-enable UFMPACK. Poisson Python demo is now working\!
Are you sure about UMFPACK ;). I bet that you have PETSc enabled, which is providing the libs that UMFPACK needs. Garth > modified: > CMakeLists.txt > cmake/FindUMFPACK.dolfin.cmake > dolfin/CMakeLists.txt > > > -- > lp:dolfin > https://code.launchpad.net/~dolfin-core/dolfin/main > > Your team DOLFIN Core Team is subscribed to branch lp:dolfin. > To unsubscribe from this branch go to > https://code.launchpad.net/~dolfin-core/dolfin/main/+edit-subscription > differences between files attachment (revision-diff.txt) > === modified file 'CMakeLists.txt' > --- CMakeLists.txt 2010-08-11 12:03:32 +0000 > +++ CMakeLists.txt 2010-08-11 12:15:07 +0000 > @@ -74,9 +74,9 @@ > #if(DOLFIN_ENABLE_SCOTCH) > # include(FindSCOTCH.dolfin) > #endif(DOLFIN_ENABLE_SCOTCH) > -#if(DOLFIN_ENABLE_UMFPACK) > -# find_package(UMFPACK.dolfin) > -#endif(DOLFIN_ENABLE_UMFPACK) > +if(DOLFIN_ENABLE_UMFPACK) > + find_package(UMFPACK.dolfin) > +endif(DOLFIN_ENABLE_UMFPACK) > #if(DOLFIN_ENABLE_TRILINOS) > # include(FindTrilinos.dolfin) > #endif(DOLFIN_ENABLE_TRILINOS) > > === modified file 'cmake/FindUMFPACK.dolfin.cmake' > --- cmake/FindUMFPACK.dolfin.cmake 2010-08-10 15:33:10 +0000 > +++ cmake/FindUMFPACK.dolfin.cmake 2010-08-11 12:15:07 +0000 > @@ -3,12 +3,13 @@ > message(STATUS "Checking for package 'UMFPACK'") > > # Check for header file > -find_path(UMFPACK_INCLUDE_DIR umfpack.h > - $ENV{UMFPACK_DIR} > - /usr/local/include/suitesparse > - /usr/include/suitesparse > - DOC "Directory where the UMFPACK header is located" > - ) > +find_path(UMFPACK_INCLUDE_DIR > + NAMES umfpack.h > + HINTS $ENV{UMFPACK_DIR} > + PATHS /usr/local /usr /opt/local /sw > + PATH_SUFFIXES include/suitesparse include > + DOC "Directory where the UMFPACK header is located" > + ) > mark_as_advanced(UMFPACK_INCLUDE_DIR) > > # Check for library > @@ -68,9 +69,6 @@ > if(UMFPACK_TEST_RUNS) > message(" Found package 'UMFPACK'") > set(UMFPACK_FOUND 1) > - include_directories(${UMFPACK_INCLUDE_DIR}) > - link_directories(${UMFPACK_LIBRARY}) > - add_definitions(-DHAS_UMFPACK) > else(UMFPACK_TEST_RUNS) > message(" Unable to configure package 'UMFPACK'") > endif(UMFPACK_TEST_RUNS) > > === modified file 'dolfin/CMakeLists.txt' > --- dolfin/CMakeLists.txt 2010-08-11 10:42:23 +0000 > +++ dolfin/CMakeLists.txt 2010-08-11 12:15:07 +0000 > @@ -77,6 +77,12 @@ > list(APPEND DOLFIN_TARGET_LINK_LIBRARIES ${PETSC_LIBRARIES}) > endif(ENABLE_PETSC AND PETSC_FOUND) > > +if(DOLFIN_ENABLE_UMFPACK AND UMFPACK_FOUND) > + list(APPEND DOLFIN_DEFINITIONS "-DHAS_UMFPACK") > + list(APPEND DOLFIN_INCLUDE_DIRECTORIES ${UMFPACK_INCLUDE_DIR}) > + list(APPEND DOLFIN_TARGET_LINK_LIBRARIES ${UMFPACK_LIBRARY}) > +endif(DOLFIN_ENABLE_UMFPACK AND UMFPACK_FOUND) > + > add_definitions(${DOLFIN_DEFINITIONS}) > include_directories(${DOLFIN_SOURCE_DIR} ${DOLFIN_INCLUDE_DIRECTORIES}) > > _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : dolfin@lists.launchpad.net Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
