]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Contrib UMFPACK is broken atm
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 11:45:33 +0000 (11:45 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 11:45:33 +0000 (11:45 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26717 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/cmake/configure/configure_umfpack.cmake

index 26daadae5d7455fb464b1dd6bc0147ce869eb1cd..73f36f7cca451825e033cbc6f35ea222311117f1 100644 (file)
@@ -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."
index 9a7380347b624a197b54dd408db92d86bd4fade6..d180c2359fd9d2093d8f51e4ae04fc9e7da5baca 100644 (file)
@@ -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()
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.