File dolfin-1.1.0-suitesparse.patch of Package dolfin
diff -Naur dolfin-1.6.0-old/cmake/modules/FindCHOLMOD.cmake dolfin-1.6.0-new/cmake/modules/FindCHOLMOD.cmake
--- dolfin-1.6.0-old/cmake/modules/FindCHOLMOD.cmake 2015-07-28 17:05:55.000000000 +0200
+++ dolfin-1.6.0-new/cmake/modules/FindCHOLMOD.cmake 2015-09-25 16:18:24.825129242 +0200
@@ -39,6 +39,8 @@
# Find packages that CHOLMOD depends on
set(CMAKE_LIBRARY_PATH ${BLAS_DIR}/lib $ENV{BLAS_DIR}/lib ${CMAKE_LIBRARY_PATH})
set(CMAKE_LIBRARY_PATH ${LAPACK_DIR}/lib $ENV{LAPACK_DIR}/lib ${CMAKE_LIBRARY_PATH})
+find_package(RT)
+find_package(SUITESPARSECONFIG)
find_package(AMD QUIET)
find_package(BLAS QUIET)
find_package(LAPACK QUIET)
@@ -102,6 +104,12 @@
if (AMD_FOUND)
set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${AMD_LIBRARIES})
endif()
+if (SUITESPARSECONFIG_FOUND)
+ set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${SUITESPARSECONFIG_LIBRARIES})
+endif()
+if (RT_FOUND)
+ set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${RT_LIBRARIES})
+endif()
if (CAMD_LIBRARY)
set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${CAMD_LIBRARY})
endif()
diff -Naur dolfin-1.6.0-old/cmake/modules/FindRT.cmake dolfin-1.6.0-new/cmake/modules/FindRT.cmake
--- dolfin-1.6.0-old/cmake/modules/FindRT.cmake 1970-01-01 01:00:00.000000000 +0100
+++ dolfin-1.6.0-new/cmake/modules/FindRT.cmake 2015-09-25 16:18:24.825129242 +0200
@@ -0,0 +1,21 @@
+# - Try to find RT
+# Once done this will define
+#
+# RT_FOUND - system has RT
+# RT_LIBRARIES - libraries for RT
+
+message(STATUS "Checking for package 'RT'")
+
+
+# Check for RT library
+find_library(RT_LIBRARIES rt
+ HINTS ${RT_DIR}/lib $ENV{RT_DIR}/lib
+ DOC "The RT library"
+ )
+mark_as_advanced(RT_LIBRARY)
+
+# Standard package handling
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(RT
+ "RT could not be found. Be sure to set RT_DIR."
+ RT_LIBRARIES )
diff -Naur dolfin-1.6.0-old/cmake/modules/FindSUITESPARSECONFIG.cmake dolfin-1.6.0-new/cmake/modules/FindSUITESPARSECONFIG.cmake
--- dolfin-1.6.0-old/cmake/modules/FindSUITESPARSECONFIG.cmake 1970-01-01 01:00:00.000000000 +0100
+++ dolfin-1.6.0-new/cmake/modules/FindSUITESPARSECONFIG.cmake 2015-09-25 16:18:24.825129242 +0200
@@ -0,0 +1,29 @@
+# - Try to find SUITESPARSECONFIG
+# Once done this will define
+#
+# SUITESPARSECONFIG_FOUND - system has AMD
+# SUITESPARSECONFIG_INCLUDE_DIRS - include directories for AMD
+# SUITESPARSECONFIG_LIBRARIES - libraries for AMD
+
+message(STATUS "Checking for package 'SUITESPARSECONFIG'")
+
+# Check for header file
+find_path(SUITESPARSECONFIG_INCLUDE_DIRS SuiteSparse_config.h
+ HINTS ${SUITESPARSECONFIG_DIR}/include $ENV{SUITESPARSECONFIG_DIR}/include
+ PATH_SUFFIXES suitesparse ufsparse
+ DOC "Directory where the AMD header is located"
+ )
+mark_as_advanced(SUITESPARSECONFIG_INCLUDE_DIRS)
+
+# Check for SUITESPARSECONFIG library
+find_library(SUITESPARSECONFIG_LIBRARIES suitesparseconfig
+ HINTS ${SUITESPARSECONFIG_DIR}/lib $ENV{SUITESPARSECONFIG_DIR}/lib
+ DOC "The SUITESPARSECONFIG library"
+ )
+mark_as_advanced(SUITESPARSECONFIG_LIBRARY)
+
+# Standard package handling
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SUITESPARSECONFIG
+ "SUITESPARSECONFIG could not be found. Be sure to set SUITESPARSECONFIG_DIR."
+ SUITESPARSECONFIG_LIBRARIES SUITESPARSECONFIG_INCLUDE_DIRS)
diff -Naur dolfin-1.6.0-old/cmake/modules/FindUMFPACK.cmake dolfin-1.6.0-new/cmake/modules/FindUMFPACK.cmake
--- dolfin-1.6.0-old/cmake/modules/FindUMFPACK.cmake 2015-07-28 17:05:55.000000000 +0200
+++ dolfin-1.6.0-new/cmake/modules/FindUMFPACK.cmake 2015-09-25 16:18:24.826129240 +0200
@@ -9,6 +9,8 @@
# Find packages that UMFPACK depends on
#set(CMAKE_LIBRARY_PATH ${BLAS_DIR}/lib $ENV{BLAS_DIR}/lib ${CMAKE_LIBRARY_PATH})
+find_package(RT)
+find_package(SUITESPARSECONFIG)
find_package(AMD QUIET)
find_package(BLAS QUIET)
find_package(CHOLMOD QUIET)
@@ -44,6 +46,12 @@
if (AMD_FOUND)
set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARY} ${AMD_LIBRARIES})
endif()
+if (SUITESPARSECONFIG_FOUND)
+ set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${SUITESPARSECONFIG_LIBRARIES})
+endif()
+if (RT_FOUND)
+ set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${RT_LIBRARIES})
+endif()
if (BLAS_FOUND)
set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${BLAS_LIBRARIES})
endif()