[SuiteSparse] Enable CMake checks for LDL and SPQR

Use proper C macros for LDL and SPQR.

cmake/modules/DuneIstlMacros.cmake

@@ -12,3 +12,5 @@ find_package(SuiteSparse OPTIONAL_COMPONENTS UMFPACK)
 include(AddSuiteSparseFlags)
 find_package(ARPACKPP)
 include(AddARPACKPPFlags)
+find_package(SuiteSparse OPTIONAL_COMPONENTS LDL SPQR)
+include(AddSuiteSparseFlags)

dune/istl/ldl.hh

@@ -3,7 +3,7 @@
 #ifndef DUNE_ISTL_LDL_HH
 #define DUNE_ISTL_LDL_HH
 
-#if HAVE_LDL || defined DOXYGEN
+#if HAVE_SUITESPARSE_LDL || defined DOXYGEN
 
 #include <iostream>
 #include <type_traits>
@@ -337,5 +337,5 @@ namespace Dune {
 
 }
 
-#endif //HAVE_LDL
+#endif //HAVE_SUITESPARSE_LDL
 #endif //DUNE_ISTL_LDL_HH

dune/istl/spqr.hh

@@ -3,7 +3,7 @@
 #ifndef DUNE_ISTL_SPQR_HH
 #define DUNE_ISTL_SPQR_HH
 
-#if HAVE_SPQR || defined DOXYGEN
+#if HAVE_SUITESPARSE_SPQR || defined DOXYGEN
 
 #include <complex>
 #include <type_traits>
@@ -287,5 +287,5 @@ namespace Dune {
 
 }
 
-#endif //HAVE_SPQR
+#endif //HAVE_SUITESPARSE_SPQR
 #endif //DUNE_ISTL_SPQR_HH

dune/istl/test/ldltest.cc

@@ -14,7 +14,7 @@
 
 int main(int argc, char** argv)
 {
-#if HAVE_LDL
+#if HAVE_SUITESPARSE_LDL
   try
   {
     typedef double FIELD_TYPE;
@@ -81,8 +81,8 @@ int main(int argc, char** argv)
   {
     std::cerr << "Unknown exception" << std::endl;
   }
-#else // #if HAVE_LDL
+#else // HAVE_SUITESPARSE_LDL
   std::cerr << "You need SuiteSparse's LDL to run this test." << std::endl;
   return 77;
-#endif // #if HAVE_LDL
+#endif // HAVE_SUITESPARSE_LDL
 }

dune/istl/test/spqrtest.cc

@@ -15,7 +15,7 @@
 
 int main(int argc, char** argv)
 {
-#if HAVE_SPQR
+#if HAVE_SUITESPARSE_SPQR
   try
   {
     typedef double FIELD_TYPE;
@@ -82,8 +82,8 @@ int main(int argc, char** argv)
   {
     std::cerr << "Unknown exception" << std::endl;
   }
-#else // #if HAVE_SPQR
-  std::cerr << "You need SuiteSparse's LDL to run this test." << std::endl;
+#else // HAVE_SUITESPARSE_SPQR
+  std::cerr << "You need SuiteSparse's SPQR to run this test." << std::endl;
   return 77;
-#endif // #if HAVE_SPQR
+#endif // HAVE_SUITESPARSE_SPQR
 }