Commit a27400fd authored by John Biddiscombe's avatar John Biddiscombe
Browse files

Improvments to MKL and FFTW find for non module based machines

parent 5bec8dbe

cmake/FindFFTW.cmake

+1 −1
Original line number Diff line number Diff line
@@ -64,4 +64,4 @@ include(FindPackageHandleStandardArgs) 
find_package_handle_standard_args(FFTW DEFAULT_MSG FFTW_INCLUDE_DIRS FFTW_LIBRARIES)



# ==================================================================================================

message("FFTW found ${FFTW_FOUND} ${FFTW_INCLUDE_DIRS} ${FFTW_LIBRARIES}")

cmake/dca_external_libs.cmake

+9 −9
Original line number Diff line number Diff line
@@ -12,15 +12,15 @@ set(DCA_EXTERNAL_INCLUDE_DIRS "" CACHE INTERNAL "") 
################################################################################

# Lapack

if (NOT DCA_HAVE_LAPACK)

#  mark_as_advanced(LAPACK_LIBRARIES)

#  find_package(MKL QUIET)

#  if (MKL_FOUND)

#     set(LAPACK_INCLUDE_DIRS ${MKL_INCLUDE_DIRS})

#     set(LAPACK_LIBRARIES mkl::mkl)

#  else()

  mark_as_advanced(LAPACK_LIBRARIES)

  find_package(MKL QUIET)

  if (MKL_FOUND)

     set(LAPACK_INCLUDE_DIRS ${MKL_INCLUDE_DIRS})

     set(LAPACK_LIBRARIES mkl::mkl)

  else()

    find_package(LAPACK REQUIRED)

#  endif()

#  list(APPEND DCA_EXTERNAL_LIBS ${LAPACK_LIBRARIES})

  endif()

  list(APPEND DCA_EXTERNAL_LIBS ${LAPACK_LIBRARIES})

endif()



mark_as_advanced(LAPACK_LIBRARIES)
@@ -40,7 +40,7 @@ list(APPEND DCA_EXTERNAL_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS} ${HDF5_INCLUDE_DIR}) 


################################################################################

# FFTW

find_package(FFTW)

find_package(FFTW REQUIRED)



list(APPEND DCA_EXTERNAL_LIBS ${FFTW_LIBRARIES})

list(APPEND DCA_EXTERNAL_INCLUDE_DIRS ${FFTW_INCLUDE_DIRS})