build: switch oneMKL threading layer to TBB
This commit is contained in:
@@ -159,11 +159,10 @@ target_link_options(fesa_cli PRIVATE
|
||||
unset(_fesa_target)
|
||||
|
||||
if(WIN32)
|
||||
if(NOT TARGET MKL::mkl_intel_thread OR NOT TARGET MKL::mkl_core OR
|
||||
NOT OMP_DLL_DIR OR NOT OMP_DLLNAME)
|
||||
if(NOT TARGET ${FESA_MKL_THREAD_TARGET} OR NOT TARGET MKL::mkl_core)
|
||||
message(FATAL_ERROR "The oneMKL runtime files required by fesa.exe were not resolved")
|
||||
endif()
|
||||
if(NOT EXISTS "${OMP_DLL_DIR}/libmmd.dll")
|
||||
if(NOT EXISTS "${FESA_INTEL_MATH_RUNTIME}")
|
||||
message(FATAL_ERROR "The Intel runtime required by the selected HDF5 DLL was not resolved")
|
||||
endif()
|
||||
|
||||
@@ -182,16 +181,13 @@ if(WIN32)
|
||||
"$<TARGET_FILE:TBB::tbb>"
|
||||
"$<TARGET_FILE_DIR:fesa_cli>"
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy_if_different
|
||||
"$<TARGET_FILE:MKL::mkl_intel_thread>"
|
||||
"$<TARGET_FILE:${FESA_MKL_THREAD_TARGET}>"
|
||||
"$<TARGET_FILE_DIR:fesa_cli>"
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy_if_different
|
||||
"$<TARGET_FILE:MKL::mkl_core>"
|
||||
"$<TARGET_FILE_DIR:fesa_cli>"
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy_if_different
|
||||
"${OMP_DLL_DIR}/${OMP_DLLNAME}"
|
||||
"$<TARGET_FILE_DIR:fesa_cli>"
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy_if_different
|
||||
"${OMP_DLL_DIR}/libmmd.dll"
|
||||
"${FESA_INTEL_MATH_RUNTIME}"
|
||||
"$<TARGET_FILE_DIR:fesa_cli>"
|
||||
COMMAND "${CMAKE_COMMAND}" -E copy_if_different
|
||||
"${_fesa_cli_mkl_dispatch_dll}"
|
||||
|
||||
Reference in New Issue
Block a user