From 318603a6bcb2f836f746d10eaeef86e2180451cc Mon Sep 17 00:00:00 2001 From: "Yuhsiang M. Tsai" Date: Fri, 16 Jul 2021 17:39:11 +0200 Subject: [PATCH] Need to find MKL if ginkgo is static --- cmake/GinkgoConfig.cmake.in | 5 +++++ dpcpp/CMakeLists.txt | 1 + 2 files changed, 6 insertions(+) diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in index 61da405cf6f..4675bcb4781 100644 --- a/cmake/GinkgoConfig.cmake.in +++ b/cmake/GinkgoConfig.cmake.in @@ -78,6 +78,7 @@ set(GINKGO_AMD_ARCH_FLAGS @GINKGO_AMD_ARCH_FLAGS@) set(GINKGO_DPCPP_VERSION @GINKGO_DPCPP_VERSION@) set(GINKGO_DPCPP_FLAGS @GINKGO_DPCPP_FLAGS@) +set(GINKGO_MKL_ROOT @GINKGO_MKL_ROOT@) set(GINKGO_HAVE_PAPI_SDE @GINKGO_HAVE_PAPI_SDE@) @@ -168,4 +169,8 @@ if((NOT GINKGO_BUILD_SHARED_LIBS) AND GINKGO_BUILD_HIP) find_package(rocrand REQUIRED) endif() +if((NOT GINKGO_BUILD_SHARED_LIBS) AND GINKGO_BUILD_DPCPP) + find_package(MKL CONFIG REQUIRED HINTS "${GINKGO_MKL_ROOT}") +endif() + include(${CMAKE_CURRENT_LIST_DIR}/GinkgoTargets.cmake) diff --git a/dpcpp/CMakeLists.txt b/dpcpp/CMakeLists.txt index cd17bd97857..443d180b172 100644 --- a/dpcpp/CMakeLists.txt +++ b/dpcpp/CMakeLists.txt @@ -7,6 +7,7 @@ ginkgo_extract_dpcpp_version(${CMAKE_CXX_COMPILER} GINKGO_DPCPP_VERSION) set(GINKGO_DPCPP_VERSION ${GINKGO_DPCPP_VERSION} PARENT_SCOPE) find_package(MKL CONFIG REQUIRED HINTS "$ENV{MKLROOT}") +set(GINKGO_MKL_ROOT "${MKL_ROOT}" PARENT_SCOPE) add_library(ginkgo_dpcpp $ "") target_sources(ginkgo_dpcpp