From 46c1167bc2641d358918a3d1898ad3e982bca84a Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 25 Sep 2012 11:45:33 +0000 Subject: [PATCH] Contrib UMFPACK is broken atm git-svn-id: https://svn.dealii.org/branches/branch_cmake@26717 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 6 +-- .../cmake/configure/configure_umfpack.cmake | 52 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 26daadae5d..73f36f7cca 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -112,9 +112,9 @@ OPTION(DEAL_II_WITH_TRILINOS OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK." OFF) -OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK - "Always use the bundled umfpack library instead of an external one." - OFF) +#OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK +# "Always use the bundled umfpack library instead of an external one." +# OFF) OPTION(DEAL_II_WITH_ZLIB "Build deal.II with support for zlib." diff --git a/deal.II/cmake/configure/configure_umfpack.cmake b/deal.II/cmake/configure/configure_umfpack.cmake index 9a7380347b..d180c2359f 100644 --- a/deal.II/cmake/configure/configure_umfpack.cmake +++ b/deal.II/cmake/configure/configure_umfpack.cmake @@ -31,30 +31,30 @@ MACRO(FEATURE_UMFPACK_CONFIGURE_EXTERNAL var) SET(${var} TRUE) ENDMACRO() - -SET(FEATURE_UMFPACK_HAVE_CONTRIB TRUE) - - -MACRO(FEATURE_UMFPACK_CONFIGURE_CONTRIB var) - # - # Add umfpack and amd directly to the object files of deal.II - # - - SET(umfpack_folder "${CMAKE_SOURCE_DIR}/contrib/umfpack") - - INCLUDE_DIRECTORIES( - ${umfpack_folder}/UMFPACK/Include - ${umfpack_folder}/AMD/Include - ) - - ADD_SUBDIRECTORY(${umfpack_folder}/UMFPACK/Source) - ADD_SUBDIRECTORY(${umfpack_folder}/AMD/Source) - - SET(HAVE_LIBUMFPACK TRUE) - - SET(${var} TRUE) -ENDMACRO() - +# +#SET(FEATURE_UMFPACK_HAVE_CONTRIB TRUE) +# +# +#MACRO(FEATURE_UMFPACK_CONFIGURE_CONTRIB var) +# # +# # Add umfpack and amd directly to the object files of deal.II +# # +# +# SET(umfpack_folder "${CMAKE_SOURCE_DIR}/contrib/umfpack") +# +# INCLUDE_DIRECTORIES( +# ${umfpack_folder}/UMFPACK/Include +# ${umfpack_folder}/AMD/Include +# ) +# +# ADD_SUBDIRECTORY(${umfpack_folder}/UMFPACK/Source) +# ADD_SUBDIRECTORY(${umfpack_folder}/AMD/Source) +# +# SET(HAVE_LIBUMFPACK TRUE) +# +# SET(${var} TRUE) +#ENDMACRO() +# SET(FEATURE_UMFPACK_CUSTOM_ERROR_MESSAGE TRUE) @@ -68,8 +68,8 @@ MACRO(FEATURE_UMFPACK_ERROR_MESSAGE) " $ UMFPACK_DIR=\"...\" cmake <...>\n" " $ ccmake -DUMFPACK_DIR=\"...\" cmake <...>\n" "or set the relevant variables by hand in ccmake.\n" - "Alternatively you may choose to compile the bundled contrib libraries\n" - "by setting DEAL_II_ALLOW_CONTRIB=on or DEAL_II_FORCE_CONTRIB_UMFPACK=on.\n\n" +# "Alternatively you may choose to compile the bundled contrib libraries\n" +# "by setting DEAL_II_ALLOW_CONTRIB=on or DEAL_II_FORCE_CONTRIB_UMFPACK=on.\n\n" ) ENDMACRO() -- 2.39.5