Mercurial > octave

changeset 29268:d4d56704978e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Search SPQR header without sub-directory (bug #59828). * configure.ac: Search SuiteSparseQR.hpp without sub-folder. * liboctave/util/oct-sparse.h: Use header if found at that location.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 05 Jan 2021 20:48:18 +0100
parents 1db2a57a42c2
children d8cb0f06ffb1
files configure.ac liboctave/util/oct-sparse.h
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Jan 05 20:38:01 2021 +0100
+++ b/configure.ac	Tue Jan 05 20:48:18 2021 +0100
@@ -2148,7 +2148,7 @@
 
 OCTAVE_CHECK_LIB(spqr, SPQR,
   [SPQR library not found.  This will result in some lack of functionality for sparse matrices.],
-  [suitesparse/SuiteSparseQR.hpp],
+  [suitesparse/SuiteSparseQR.hpp SuiteSparseQR.hpp],
   [SuiteSparseQR_C],
   [C++], [don't use SPQR library, disable some sparse matrix functionality])
 
--- a/liboctave/util/oct-sparse.h	Tue Jan 05 20:38:01 2021 +0100
+++ b/liboctave/util/oct-sparse.h	Tue Jan 05 20:48:18 2021 +0100
@@ -95,6 +95,8 @@
 
 #if defined (HAVE_SUITESPARSE_SUITESPARSEQR_HPP)
 #  include <suitesparse/SuiteSparseQR.hpp>
+#elif defined (HAVE_SUITESPARSEQR_HPP)
+#  include <SuiteSparseQR.hpp>
 #endif
 
 // Cope with new SuiteSparse versions