diff options
| author | Kyle Guinn <elyk03@gmail.com> | 2017-02-01 20:46:28 -0600 |
|---|---|---|
| committer | Kyle Guinn <elyk03@gmail.com> | 2017-02-01 20:46:28 -0600 |
| commit | 13b5b2c88cfd0218069e2572a95f41ac1fb7992e (patch) | |
| tree | 6f0e5651195fdd2657fc5720ce249c04e4aef855 /SRC | |
| parent | 0d8ca785a7cf279d41f276fcaf36894171f133db (diff) | |
| download | lapack-13b5b2c88cfd0218069e2572a95f41ac1fb7992e.tar.gz lapack-13b5b2c88cfd0218069e2572a95f41ac1fb7992e.tar.bz2 lapack-13b5b2c88cfd0218069e2572a95f41ac1fb7992e.zip | |
Allow building LAPACKE with XBLAS and TMGLIB simultaneously
Order the libraries the same as the Makefiles are ordering them:
tmglib, lapack, xblas, blas.
Fix combinations of USE_XBLAS with BUILD_SINGLE, etc. so that it only
builds the LAPACK extended functions of the desired type and precision.
Remove "OBJ" from variable names that are not lists of objects.
Diffstat (limited to 'SRC')
| -rw-r--r-- | SRC/CMakeLists.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt index e80a5b32..0fbbfdb0 100644 --- a/SRC/CMakeLists.txt +++ b/SRC/CMakeLists.txt @@ -467,11 +467,6 @@ set(ZXLASRC zgesvxx.f zgerfsx.f zla_gerfsx_extended.f zla_geamv.f zla_heamv.f zla_hercond_c.f zla_hercond_x.f zla_herpvgrw.f zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f) - -if(USE_XBLAS) - set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC}) -endif() - if(BUILD_DEPRECATED) list(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f DEPRECATED/sgeqpf.f DEPRECATED/sgelsx.f DEPRECATED/sggsvd.f @@ -485,7 +480,14 @@ if(BUILD_DEPRECATED) list(APPEND ZLASRC DEPRECATED/zgegs.f DEPRECATED/zgegv.f DEPRECATED/zgeqpf.f DEPRECATED/zgelsx.f DEPRECATED/zggsvd.f DEPRECATED/zggsvp.f DEPRECATED/zlahrd.f DEPRECATED/zlatzm.f DEPRECATED/ztzrqf.f) - message(STATUS "Building deprecated routines") + message(STATUS "Building LAPACK deprecated routines") +endif() + +if(USE_XBLAS) + list(APPEND SLASRC ${SXLASRC}) + list(APPEND DLASRC ${DXLASRC}) + list(APPEND CLASRC ${CXLASRC}) + list(APPEND ZLASRC ${ZXLASRC}) endif() set(ALLOBJ) @@ -513,13 +515,16 @@ if(NOT ALLOBJ) endif() -add_library(lapack ${ALLOBJ} ${ALLXOBJ}) -target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY}) - +add_library(lapack ${ALLOBJ}) set_target_properties( lapack PROPERTIES VERSION ${LAPACK_VERSION} SOVERSION ${LAPACK_MAJOR_VERSION} ) +if(USE_XBLAS) + target_link_libraries(lapack ${XBLAS_LIBRARY}) +endif() +target_link_libraries(lapack ${BLAS_LIBRARIES}) + lapack_install_library(lapack) |