From abb9fcd4a4336f8708f2abea1fb056f187a45ac9 Mon Sep 17 00:00:00 2001 From: Mark Hoemmen Date: Wed, 17 Feb 2016 10:32:47 -0800 Subject: [PATCH 2/3] TpetraKernels: Add MKL TPL @trilinos/tpetra MKL as a TPL doesn't mean the BLAS and LAPACK; it means header files and other functions. --- packages/tpetra/kernels/cmake/Dependencies.cmake | 2 +- packages/tpetra/kernels/cmake/TpetraKernels_config.h.in | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/tpetra/kernels/cmake/Dependencies.cmake b/packages/tpetra/kernels/cmake/Dependencies.cmake index 5680c9c..33ee31f 100644 --- a/packages/tpetra/kernels/cmake/Dependencies.cmake +++ b/packages/tpetra/kernels/cmake/Dependencies.cmake @@ -5,5 +5,5 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( LIB_REQUIRED_PACKAGES KokkosCore KokkosContainers TeuchosCore TeuchosComm KokkosAlgorithms - LIB_OPTIONAL_TPLS quadmath + LIB_OPTIONAL_TPLS quadmath MKL ) diff --git a/packages/tpetra/kernels/cmake/TpetraKernels_config.h.in b/packages/tpetra/kernels/cmake/TpetraKernels_config.h.in index 60d6f8d..aee0671 100644 --- a/packages/tpetra/kernels/cmake/TpetraKernels_config.h.in +++ b/packages/tpetra/kernels/cmake/TpetraKernels_config.h.in @@ -7,6 +7,9 @@ /* Define this macro if the quadmath TPL is enabled */ #cmakedefine HAVE_TPETRAKERNELS_QUADMATH +/* Define this macro if the MKL TPL is enabled */ +#cmakedefine HAVE_TPETRAKERNELS_MKL + /* Define this macro if experimental features of Kokkoskernels are enabled */ #cmakedefine HAVE_TPETRAKERNELS_EXPERIMENTAL -- 2.1.3