From 394baacd9e4e2dd4d92d4b79fd3e7f7d683cde9f Mon Sep 17 00:00:00 2001
From: Anton Chernov <mechernov@gmail.com>
Date: Wed, 8 Aug 2018 16:01:46 +0200
Subject: [PATCH] Fixed mshadow MKL/MKLML finding

---
 cmake/ChooseBLAS.cmake        |  6 +++---
 cmake/Modules/FindMKL.cmake   |  4 ++++
 cmake/Modules/FindMKLML.cmake | 13 +++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cmake/ChooseBLAS.cmake b/cmake/ChooseBLAS.cmake
index a6dd877b7e5d..cdf8c847cdbd 100644
--- a/cmake/ChooseBLAS.cmake
+++ b/cmake/ChooseBLAS.cmake
@@ -123,10 +123,10 @@ function(try_mklml)
 
   include(${CMAKE_CURRENT_LIST_DIR}/DownloadMKLML.cmake)
   find_package(MKLML REQUIRED)
-  include_directories(SYSTEM ${MKLML_INCLUDE_DIRS})
-  set(mxnet_LINKER_LIBS ${mxnet_LINKER_LIBS} ${MKLML_LIBRARIES} PARENT_SCOPE)
+  include_directories(SYSTEM ${MKL_INCLUDE_DIRS})
+  set(mxnet_LINKER_LIBS ${mxnet_LINKER_LIBS} ${MKL_LIBRARIES} PARENT_SCOPE)
 
-  set(MKL_FOUND ${MKLML_FOUND} PARENT_SCOPE)
+  set(MKL_FOUND ${MKL_FOUND} PARENT_SCOPE)
   set(MKLROOT ${MKLROOT} PARENT_SCOPE)
 
   set(BLAS MKL PARENT_SCOPE)
diff --git a/cmake/Modules/FindMKL.cmake b/cmake/Modules/FindMKL.cmake
index e52b7423b0e7..e45eef92749f 100644
--- a/cmake/Modules/FindMKL.cmake
+++ b/cmake/Modules/FindMKL.cmake
@@ -32,6 +32,10 @@
 #   MKL_LIBRARIES        : the libraries to link against.
 #
 
+if(MKL_FOUND)
+  return()
+endif()
+
 if($ENV{MKLROOT})
   file(TO_CMAKE_PATH "$ENV{MKLROOT}" MKLROOT)
   message(STATUS "MKLROOT=${MKLROOT}")
diff --git a/cmake/Modules/FindMKLML.cmake b/cmake/Modules/FindMKLML.cmake
index 27c340ee59f5..78a3f65b9c7f 100644
--- a/cmake/Modules/FindMKLML.cmake
+++ b/cmake/Modules/FindMKLML.cmake
@@ -23,9 +23,13 @@
 #
 # The following are set after configuration is done:
 #
-# MKLML_FOUND
-# MKLML_INCLUDE_DIRS
-# MKLML_LIBRARIES
+# MKL_FOUND
+# MKL_INCLUDE_DIRS
+# MKL_LIBRARIES
+
+if(MKL_FOUND)
+  return()
+endif()
 
 if($ENV{MKLROOT})
   file(TO_CMAKE_PATH "$ENV{MKLROOT}" MKLROOT)
@@ -96,7 +100,8 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MKLML DEFAULT_MSG ${LOOKED_FOR})
 
 if(MKLML_FOUND)
-  set(MKLML_INCLUDE_DIRS "${MKLML_INCLUDE_DIR}")
+  set(MKL_FOUND ${MKLML_FOUND})
+  set(MKL_INCLUDE_DIRS "${MKLML_INCLUDE_DIR}")
 
   mark_as_advanced(${LOOKED_FOR})