From e129e985c3cd36e8f5fe2e25db3d2a880298aae8 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 21 Feb 2011 15:48:37 +0100 Subject: [PATCH] link to blas/lapack only when needed, and use the static versions to hopefully workaround weird linking issues to gfortranbegin (see jitse dashboard) --- unsupported/test/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 7f3f2b0b7..854a41e70 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(Cholmod) if(CHOLMOD_FOUND) add_definitions("-DEIGEN_CHOLMOD_SUPPORT") include_directories(${CHOLMOD_INCLUDES}) - set(SPARSE_LIBS ${SPARSE_LIBS} ${CHOLMOD_LIBRARIES}) + set(SPARSE_LIBS ${SPARSE_LIBS} ${CHOLMOD_LIBRARIES} eigen_blas_static eigen_lapack_static) ei_add_property(EIGEN_TESTED_BACKENDS "Cholmod, ") else(CHOLMOD_FOUND) ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ") @@ -17,7 +17,7 @@ find_package(Umfpack) if(UMFPACK_FOUND) add_definitions("-DEIGEN_UMFPACK_SUPPORT") include_directories(${UMFPACK_INCLUDES}) - set(SPARSE_LIBS ${SPARSE_LIBS} ${UMFPACK_LIBRARIES}) + set(SPARSE_LIBS ${SPARSE_LIBS} ${UMFPACK_LIBRARIES} eigen_blas_static) ei_add_property(EIGEN_TESTED_BACKENDS "UmfPack, ") else(UMFPACK_FOUND) ei_add_property(EIGEN_MISSING_BACKENDS "UmfPack, ") @@ -27,7 +27,7 @@ find_package(SuperLU) if(SUPERLU_FOUND) add_definitions("-DEIGEN_SUPERLU_SUPPORT") include_directories(${SUPERLU_INCLUDES}) - set(SPARSE_LIBS ${SPARSE_LIBS} ${SUPERLU_LIBRARIES}) + set(SPARSE_LIBS ${SPARSE_LIBS} ${SUPERLU_LIBRARIES} eigen_blas_static) ei_add_property(EIGEN_TESTED_BACKENDS "SuperLU, ") else(SUPERLU_FOUND) ei_add_property(EIGEN_MISSING_BACKENDS "SuperLU, ") @@ -74,9 +74,9 @@ else() ei_add_property(EIGEN_MISSING_BACKENDS "MPFR C++, ") endif() -ei_add_test(sparse_llt "" "${SPARSE_LIBS};eigen_blas;eigen_lapack") -ei_add_test(sparse_ldlt "" "${SPARSE_LIBS};eigen_blas;eigen_lapack") -ei_add_test(sparse_lu "" "${SPARSE_LIBS};eigen_blas") +ei_add_test(sparse_llt "" "${SPARSE_LIBS}") +ei_add_test(sparse_ldlt "" "${SPARSE_LIBS}") +ei_add_test(sparse_lu "" "${SPARSE_LIBS}") ei_add_test(sparse_extra "" "") find_package(FFTW)