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."
SET(FEATURE_UMFPACK_DEPENDS
DEAL_II_WITH_BLAS
- DEAL_II_WITH_LAPACK
)
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)
" $ 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()