From 82a41e0ad79fe5a508f1bc2cdbd8b3e6c6258be6 Mon Sep 17 00:00:00 2001
From: huzhiqiang <912790387@qq.com>
Date: Fri, 1 Nov 2019 09:29:47 +0800
Subject: [PATCH] Fix opt tool cherry pick (#2322)

* fix model_opt_tool bug : judge WITH_MKL to choose whether to compile MKL (#2320)
---
 lite/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lite/CMakeLists.txt b/lite/CMakeLists.txt
index 5d5a2ff3e0..e05d209c68 100644
--- a/lite/CMakeLists.txt
+++ b/lite/CMakeLists.txt
@@ -110,8 +110,11 @@ if (LITE_WITH_X86)
            COMMAND cp -r "${CMAKE_BINARY_DIR}/third_party/eigen3" "${INFER_LITE_PUBLISH_ROOT}/third_party"
            COMMAND mkdir -p "${INFER_LITE_PUBLISH_ROOT}/demo/cxx"
            )
-    add_dependencies(publish_inference_x86_cxx_demos gflags eigen3 mklml  xbyak  xxhash glog)
     add_dependencies(publish_inference_x86_cxx_lib publish_inference_x86_cxx_demos)
+    add_dependencies(publish_inference_x86_cxx_demos gflags eigen3 xbyak xxhash glog)
+    if(WITH_MKL)
+        add_dependencies(publish_inference_x86_cxx_demos mklml)
+    endif()
 endif()
 
 if (LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND LITE_WITH_ARM)
-- 
GitLab