From 5f3e600953b12a947baef16257c8a073a28f98cf Mon Sep 17 00:00:00 2001 From: Marcus Calhoun-Lopez Date: Sat, 1 Feb 2020 05:30:27 -0700 Subject: [PATCH] avoid header name conflicts with other projects Automatically Tuned Linear Algebra Software (ATLAS) also installs a header file clapack.h. If installed, the ATLAS header file is easily found instead of the NGSolve version. --- basiclinalg/CMakeLists.txt | 2 +- basiclinalg/{clapack.h => ng_clapack.h} | 0 basiclinalg/ng_lapack.hpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename basiclinalg/{clapack.h => ng_clapack.h} (100%) diff --git a/basiclinalg/CMakeLists.txt b/basiclinalg/CMakeLists.txt index f5b249ecd..8943807ec 100644 --- a/basiclinalg/CMakeLists.txt +++ b/basiclinalg/CMakeLists.txt @@ -31,7 +31,7 @@ install( TARGETS ngbla ${ngs_install_dir} ) install( FILES bandmatrix.hpp cholesky.hpp matrix.hpp ng_lapack.hpp - vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp clapack.h + vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp ng_clapack.h tensor.hpp cuda_bla.hpp avector.hpp ngblas.hpp DESTINATION ${NGSOLVE_INSTALL_DIR_INCLUDE} COMPONENT ngsolve_devel diff --git a/basiclinalg/clapack.h b/basiclinalg/ng_clapack.h similarity index 100% rename from basiclinalg/clapack.h rename to basiclinalg/ng_clapack.h diff --git a/basiclinalg/ng_lapack.hpp b/basiclinalg/ng_lapack.hpp index 61c6360b1..b3ebc70ca 100644 --- a/basiclinalg/ng_lapack.hpp +++ b/basiclinalg/ng_lapack.hpp @@ -39,7 +39,7 @@ namespace ngbla typedef int L_fp; // ? -#include "clapack.h" +#include "ng_clapack.h" }