scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into move-cxx11-checking

This commit is contained in:
Mark Dewing 2018-03-26 09:21:55 -05:00 committed by GitHub
parent f7dd9753aa d50e4373ee
commit bcde41b561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/FindMKL.cmake
View File

@ -12,7 +12,7 @@ if ( NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel" )
string(REPLACE "/include" "" MKL_ROOT ${MKL_ROOT})
endif (NOT MKL_ROOT)
if (NOT MKL_ROOT)
message (FATAL_ERROR "ENABLE_OUTSIDE_MKL is TRUE and mkl not found. Set MKL_ROOT." )
message (FATAL_ERROR "ENABLE_MKL is TRUE and mkl not found. Set MKL_ROOT." )
endif (NOT MKL_ROOT)
# Finding and setting the MKL_LINK_DIRECTORIES

12
CMakeLists.txt
View File

@ -467,11 +467,15 @@ ELSE(CMAKE_TOOLCHAIN_FILE)
#-------------------------------------------------------------------
# Quick search for MKL (this will need to be improved).
# This reproduces the old intel -mkl behavior or
# if ENABLE_OUTSIDE_MKL is set to 1 supports other compilers
SET(ENABLE_OUTSIDE_MKL FALSE CACHE BOOL "ENABLE MKL for non-intel compilers (Experimental)")
IF (INTEL_COMPILER OR ENABLE_OUTSIDE_MKL)
# if ENABLE_MKL is set to 1 supports other compilers
IF (INTEL_COMPILER)
SET(ENABLE_MKL TRUE CACHE BOOL "ENABLE MKL for Intel compilers")
ELSE (INTEL_COMPILER)
SET(ENABLE_MKL FALSE CACHE BOOL "ENABLE MKL for non-intel compilers (Experimental)")
ENDIF (INTEL_COMPILER)
IF (ENABLE_MKL)
INCLUDE(CMake/FindMKL.cmake)
ENDIF(INTEL_COMPILER OR ENABLE_OUTSIDE_MKL)
ENDIF(ENABLE_MKL)
IF ( HAVE_MKL )
# We found MKL, add the link library
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MKL_FLAGS}")