Merge branch 'master' into yaml
This commit is contained in:
commit
e2ae1fac50
@ -508,7 +508,7 @@ if (ENABLE_STATIC_LINKING)
|
|||||||
BLAS_TYPE MATCHES SYSTEM_NATIVE OR
|
BLAS_TYPE MATCHES SYSTEM_NATIVE OR
|
||||||
BLAS_TYPE MATCHES OPENBLAS)
|
BLAS_TYPE MATCHES OPENBLAS)
|
||||||
#cc_blas_static with ATLAS on travis-ci needs -lm
|
#cc_blas_static with ATLAS on travis-ci needs -lm
|
||||||
set(MATH_LIBS ${MATH_LIBS} -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lm)
|
set(MATH_LIBS ${MATH_LIBS} -Wl,--whole-archive -lpthread -ldl -Wl,--no-whole-archive -lm)
|
||||||
endif()
|
endif()
|
||||||
if (LAPACK_TYPE MATCHES MKL OR
|
if (LAPACK_TYPE MATCHES MKL OR
|
||||||
BLAS_TYPE MATCHES MKL)
|
BLAS_TYPE MATCHES MKL)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user