Commit 534d7a34 authored by Kirill Terekhov's avatar Kirill Terekhov
Browse files

Merge branch 'master' of https://github.com/INMOST-DEV/INMOST

parents 8d0d3c19 4b0e5625
......@@ -334,7 +334,9 @@ if(USE_SOLVER_SUPERLU)
if( WIN32 )
set(SUPERLU_LIBRARIES "${LIB_DOWNLOAD_PATH}/lib/superlu.lib;${BLAS_LIBRARIES}" CACHE PATH "SUPERLU_LIBRARIES is set" FORCE)
else( WIN32 )
set(SUPERLU_LIBRARIES "${LIB_DOWNLOAD_PATH}/lib/libsuperlu.a;${BLAS_LIBRARIES}" CACHE PATH "SUPERLU_LIBRARIES is set" FORCE)
include(GNUInstallDirs)
message("gnu install library dirs ${CMAKE_INSTALL_LIBDIR}")
set(SUPERLU_LIBRARIES "${LIB_DOWNLOAD_PATH}/${CMAKE_INSTALL_LIBDIR}/libsuperlu.a;${BLAS_LIBRARIES}" CACHE PATH "SUPERLU_LIBRARIES is set" FORCE)
endif( WIN32 )
message("-- SUPERLU_INCLUDE_DIR: ${SUPERLU_INCLUDES}")
message("-- SUPERLU_LIBRARIES: ${SUPERLU_LIBRARIES}")
......@@ -403,7 +405,9 @@ if(USE_SOLVER_SUPERLU)
if( WIN32 )
set(SUPERLU_LIBRARIES "${SUPERLU_LIBRARIES};${METIS_LIBRARIES};${LIB_DOWNLOAD_PATH}/lib/superlu_dist.lib;${LAPACK_LIBRARIES};${BLAS_LIBRARIES};${PARMETIS_LIBRARIES}" CACHE PATH "SUPERLU_LIBRARIES is set" FORCE)
else( WIN32 )
set(SUPERLU_LIBRARIES "${SUPERLU_LIBRARIES};${METIS_LIBRARIES};${LIB_DOWNLOAD_PATH}/lib/libsuperlu_dist.a;${LAPACK_LIBRARIES};${BLAS_LIBRARIES};${PARMETIS_LIBRARIES}" CACHE PATH "SUPERLU_LIBRARIES is set" FORCE)
include(GNUInstallDirs)
message("gnu install library dirs ${CMAKE_INSTALL_LIBDIR}")
set(SUPERLU_LIBRARIES "${SUPERLU_LIBRARIES};${METIS_LIBRARIES};${LIB_DOWNLOAD_PATH}/${CMAKE_INSTALL_LIBDIR}/libsuperlu_dist.a;${LAPACK_LIBRARIES};${BLAS_LIBRARIES};${PARMETIS_LIBRARIES}" CACHE PATH "SUPERLU_LIBRARIES is set" FORCE)
endif( WIN32 )
message("-- SUPERLU_INCLUDE_DIR: ${SUPERLU_INCLUDES}")
message("-- SUPERLU_LIBRARIES: ${SUPERLU_LIBRARIES}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment