Changeset 13760


Ignore:
Timestamp:
Oct 16, 2019 10:19:31 AM (4 weeks ago)
Author:
aramle
Message:

#5819 Fixing namings for superlu mt in CMakeLists.txt

Location:
branches/dev-5819/ThirdParty/SuperLU/superlu_mt_3.1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/ThirdParty/SuperLU/superlu_mt_3.1/CBLAS/CMakeLists.txt

    r13752 r13760  
    2222string(TOUPPER "${CBLAS_PRECISIONS}" CBLAS_PRECISIONS)
    2323
    24 set(SBLAS1 isamax.c sasum.c saxpy.c scopy.c sdot.c snrm2.c srot.c sscal.c sswap.c)
     24set(SBLAS1 isamax.c sasum.c saxpy.c scopy.c sdot.c snrm2.c srot.c sscal.c)
    2525set(SBLAS2 sgemv.c ssymv.c strsv.c sger.c ssyr2.c)
    2626set(SINGLE_SRCS ${SBLAS1} ${SBLAS2})
    2727
    28 set(DBLAS1 idamax.c dasum.c daxpy.c dcopy.c ddot.c dnrm2.c drot.c dscal.c dswap.c)
     28set(DBLAS1 idamax.c dasum.c daxpy.c dcopy.c ddot.c dnrm2.c drot.c dscal.c)
    2929set(DBLAS2 dgemv.c dsymv.c dtrsv.c dger.c dsyr2.c)
    3030set(DOUBLE_SRCS ${DBLAS1} ${DBLAS2})
    3131
    32 set(CBLAS1 icamax.c scasum.c caxpy.c ccopy.c scnrm2.c cscal.c cswap.c )
     32set(CBLAS1 icamax.c scasum.c caxpy.c ccopy.c scnrm2.c cscal.c )
    3333set(CBLAS2 cgemv.c chemv.c ctrsv.c cgerc.c cher2.c )
    3434set(COMPLEX_SRCS ${CBLAS1} ${CBLAS2})
    3535
    36 set(ZBLAS1 izamax.c dzasum.c zaxpy.c zcopy.c dznrm2.c zscal.c dcabs1.c zswap.c )
     36set(ZBLAS1 izamax.c dzasum.c zaxpy.c zcopy.c dznrm2.c zscal.c dcabs1.c )
    3737set(ZBLAS2 zgemv.c zhemv.c ztrsv.c zgerc.c zher2.c )
    3838set(COMPLEX16_SRCS ${ZBLAS1} ${ZBLAS2})
     
    4242endforeach(precision ${CBLAS_PRECISIONS})
    4343
    44 add_library(superlu_cblas ${CBLAS_SRCS})
     44add_library(blas${SUPERLU_SUFFIX} STATIC ${CBLAS_SRCS})
     45install(TARGETS blas${SUPERLU_SUFFIX}
     46  RUNTIME DESTINATION ${SUPERLU_INSTALL_DIR}/bin
     47  LIBRARY DESTINATION ${SUPERLU_INSTALL_DIR}/lib
     48  ARCHIVE DESTINATION ${SUPERLU_INSTALL_DIR}/lib)
  • branches/dev-5819/ThirdParty/SuperLU/superlu_mt_3.1/CMakeLists.txt

    r13752 r13760  
    3030endif(NOT SUPERLU_INSTALL_DIR)
    3131
     32if(MSVC)
     33    ADD_DEFINITIONS(/D __OPENMP)
     34    set(SUPERLU_SUFFIX _OPENMP)
     35else()
     36    set(SUPERLU_SUFFIX )
     37endif()
     38
    3239if(NOT USE_CBLAS)
    3340    find_package(BLAS REQUIRED)
     
    4249endif(NOT USE_CBLAS)
    4350
    44 if(MSVC)
    45     ADD_DEFINITIONS(/D __OPENMP)
    46 endif()
     51
    4752add_subdirectory(src)
    4853
  • branches/dev-5819/ThirdParty/SuperLU/superlu_mt_3.1/SRC/CMakeLists.txt

    r13752 r13760  
    131131  )
    132132 
    133 add_library(superlu STATIC ${SUPERLU_SRCS})
     133add_library(superlu_mt${SUPERLU_SUFFIX} STATIC ${SUPERLU_SRCS})
    134134
    135 install(TARGETS superlu
     135install(TARGETS superlu_mt${SUPERLU_SUFFIX}
    136136  RUNTIME DESTINATION ${SUPERLU_INSTALL_DIR}/bin
    137137  LIBRARY DESTINATION ${SUPERLU_INSTALL_DIR}/lib
Note: See TracChangeset for help on using the changeset viewer.