mirror of https://gitlab.com/QEF/q-e.git
More robust MKL DFTI/FFTW3 detection.
This commit is contained in:
parent
c8ed49ef5a
commit
8194f48a0c
|
@ -52,7 +52,7 @@ elseif(QE_FFTW_VENDOR MATCHES "Intel")
|
|||
qe_add_global_compile_definitions(__FFTW3)
|
||||
set(qe_ext_fft_wrappers fft_scalar.FFTW3.f90)
|
||||
else()
|
||||
message(FATAL_ERROR "The unknown Intel FFTW library '${QE_FFTW_VENDOR}' is not supported!")
|
||||
message(FATAL_ERROR "The unknown Intel FFTW library '${QE_FFTW_VENDOR}' is not supported! Only accept either 'Intel_DFTI' or 'Intel_FFTW3'")
|
||||
endif()
|
||||
if(QE_ENABLE_OPENMP)
|
||||
SET(BLA_VENDOR Intel10_64lp)
|
||||
|
|
|
@ -38,8 +38,7 @@ if(BLAS_FOUND OR LAPACK_FOUND)
|
|||
${_search_path}
|
||||
PATH_SUFFIXES
|
||||
"include"
|
||||
"fftw"
|
||||
"include/fftw"
|
||||
"include/mkl"
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
find_path(VendorFFTW_INCLUDE_FFTW3
|
||||
|
@ -52,9 +51,12 @@ if(BLAS_FOUND OR LAPACK_FOUND)
|
|||
"include"
|
||||
"fftw"
|
||||
"include/fftw"
|
||||
"include/mkl/fftw"
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
set(VendorFFTW_INCLUDE_DIRS ${VendorFFTW_INCLUDE_MKL_DFTI} ${VendorFFTW_INCLUDE_FFTW3})
|
||||
if(VendorFFTW_INCLUDE_MKL_DFTI AND VendorFFTW_INCLUDE_FFTW3)
|
||||
set(VendorFFTW_INCLUDE_DIRS ${VendorFFTW_INCLUDE_MKL_DFTI} ${VendorFFTW_INCLUDE_FFTW3})
|
||||
endif()
|
||||
|
||||
add_library(VendorFFTW INTERFACE IMPORTED)
|
||||
list(APPEND VendorFFTW_LIBRARIES
|
||||
|
|
Loading…
Reference in New Issue