scnc
/
quantum-espresso
mirror of https://gitlab.com/QEF/q-e.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved architecture discovery

This commit is contained in:
Daniele Cesarini 2020-11-03 16:46:09 +01:00
parent 1cf8d437cf
commit 3dd338a5cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -19,7 +19,7 @@ if(${qe_BINARY_DIR} STREQUAL ${qe_SOURCE_DIR})
endif()
# CMake < v3.18 cannot discover the ARM Performance Library
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "^aarch64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
if(CMAKE_VERSION VERSION_LESS 3.18.0)
message("-- CMake versions less then 3.18 cannot automatically discover the ARM Performance Library!")
endif()
@ -198,7 +198,7 @@ qe_install_targets(qe_lapack)
#######################################################################
if(NOT QE_LAPACK_INTERNAL)
if(NOT BLA_VENDOR)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64.*")
message(STATUS "Trying to find LAPACK from Intel MKL")
if(QE_ENABLE_OPENMP)
SET(BLA_VENDOR Intel10_64lp)
@ -206,11 +206,11 @@ if(NOT QE_LAPACK_INTERNAL)
SET(BLA_VENDOR Intel10_64lp_seq)
endif()
find_package(LAPACK)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
message(STATUS "Trying to find LAPACK from Intel MKL - 32bit")
SET(BLA_VENDOR Intel10_32)
find_package(LAPACK)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
message(STATUS "Trying to find LAPACK from ARM Performance Library")
if(QE_ENABLE_OPENMP)
SET(BLA_VENDOR Arm_mp)