From fd3b666d8ce92eec290be96688b17165a4e3590f Mon Sep 17 00:00:00 2001
From: silingtong123 <35439432+silingtong123@users.noreply.github.com>
Date: Mon, 5 Aug 2019 10:55:53 +0800
Subject: [PATCH] test=develop,Synchronize the contents of develop with
 release1.5 (#18937)

Fix the third-party openblas dependency for paddle on windows
---
 paddle/fluid/inference/api/demo_ci/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt
index 318658e0bea..c8306b8794e 100644
--- a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt
+++ b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt
@@ -109,7 +109,7 @@ if(WITH_MKL)
 else()
   set(MATH_LIB ${PADDLE_LIB_THIRD_PARTY_PATH}openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX})
   if(WIN32)
-    set(MATH_DLL ${PADDLE_LIB_THIRD_PARTY_PATH}openblas/lib/openblas${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(MATH_DLL ${PADDLE_LIB_THIRD_PARTY_PATH}openblas/lib/openblas${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
 endif()
 
@@ -157,7 +157,7 @@ if(WIN32)
           )
     else()
     add_custom_command(TARGET ${DEMO_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy ${MATH_DLL}/openblas.dll ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}
+            COMMAND ${CMAKE_COMMAND} -E copy ${MATH_DLL} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}
             )
     endif()
 endif()
-- 
GitLab