CMakeLists.txt (armadillo-10.8.2.tar.xz) | : | CMakeLists.txt (armadillo-11.0.0.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 320 | skipping to change at line 320 | |||
endif() | endif() | |||
endif() | endif() | |||
endif() | endif() | |||
set(CMAKE_MACOSX_RPATH 1) | set(CMAKE_MACOSX_RPATH 1) | |||
else() | else() | |||
include(ARMA_FindMKL) | include(ARMA_FindMKL) | |||
include(ARMA_FindOpenBLAS) | include(ARMA_FindOpenBLAS) | |||
include(ARMA_FindATLAS) | include(ARMA_FindATLAS) # TODO: remove support for ATLAS in next major ver sion | |||
include(ARMA_FindBLAS) | include(ARMA_FindBLAS) | |||
include(ARMA_FindLAPACK) | include(ARMA_FindLAPACK) | |||
if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) | if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) | |||
include(ARMA_FindFlexiBLAS) | include(ARMA_FindFlexiBLAS) | |||
endif() | endif() | |||
message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) | message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) | |||
message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) | message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) | |||
message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) | message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) | |||
skipping to change at line 409 | skipping to change at line 409 | |||
message(STATUS "*** /usr/local/lib or /usr/local/lib64") | message(STATUS "*** /usr/local/lib or /usr/local/lib64") | |||
message(STATUS "*** make sure the run-time linker can find it.") | message(STATUS "*** make sure the run-time linker can find it.") | |||
message(STATUS "*** On Linux systems this can be done by editing /etc/ld.s o.conf") | message(STATUS "*** On Linux systems this can be done by editing /etc/ld.s o.conf") | |||
message(STATUS "*** or modifying the LD_LIBRARY_PATH environment variable. ") | message(STATUS "*** or modifying the LD_LIBRARY_PATH environment variable. ") | |||
message(STATUS "") | message(STATUS "") | |||
else() | else() | |||
if(ATLAS_FOUND) | if(ATLAS_FOUND) | |||
set(ARMA_USE_ATLAS true) | set(ARMA_USE_ATLAS true) | |||
set(ARMA_ATLAS_INCLUDE_DIR ${ATLAS_INCLUDE_DIR}) | ||||
set(ARMA_LIBS ${ARMA_LIBS} ${ATLAS_LIBRARIES}) | set(ARMA_LIBS ${ARMA_LIBS} ${ATLAS_LIBRARIES}) | |||
message(STATUS "ATLAS_INCLUDE_DIR = ${ATLAS_INCLUDE_DIR}") | message(STATUS "") | |||
message(STATUS "*** NOTE: support for ATLAS is deprecated and will be re | ||||
moved;") | ||||
message(STATUS "*** NOTE: recommend to use OpenBLAS or FlexiBLAS instead | ||||
.") | ||||
message(STATUS "") | ||||
endif() | endif() | |||
if(BLAS_FOUND) | if(BLAS_FOUND) | |||
set(ARMA_USE_BLAS true) | set(ARMA_USE_BLAS true) | |||
set(ARMA_LIBS ${ARMA_LIBS} ${BLAS_LIBRARIES}) | set(ARMA_LIBS ${ARMA_LIBS} ${BLAS_LIBRARIES}) | |||
endif() | endif() | |||
endif() | endif() | |||
if(LAPACK_FOUND) | if(LAPACK_FOUND) | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 7 lines changed or added |