From 1e83695050dd4f42fbd2326b5e15c3667a9fefec Mon Sep 17 00:00:00 2001
From: joey12300 <136876878@qq.com>
Date: Sun, 27 Oct 2019 18:08:31 +0800
Subject: [PATCH] modify the link path of libpaddle_fluid.lib in win 10,
 paddle1.6

---
 inference/CMakeLists.txt | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/inference/CMakeLists.txt b/inference/CMakeLists.txt
index ac4a8287..fb97f91f 100644
--- a/inference/CMakeLists.txt
+++ b/inference/CMakeLists.txt
@@ -69,6 +69,7 @@ link_directories("${CMAKE_CURRENT_BINARY_DIR}/ext/yaml-cpp/lib")
 link_directories("${CMAKE_CURRENT_BINARY_DIR}")
 if (WIN32)
   include_directories("${PADDLE_DIR}/paddle/fluid/inference")
+  include_directories("${PADDLE_DIR}/paddle/include")
   link_directories("${PADDLE_DIR}/paddle/fluid/inference")
   include_directories("${OPENCV_DIR}/build/include")
   include_directories("${OPENCV_DIR}/opencv/build/include")
@@ -147,22 +148,22 @@ else()
   set(MATH_LIB ${PADDLE_DIR}/third_party/install/openblas/lib/libopenblas${CMAKE_STATIC_LIBRARY_SUFFIX})
 endif()
 
+if (WIN32)
+    if(EXISTS "${PADDLE_DIR}/paddle/fluid/inference/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX}")
+        set(DEPS
+            ${PADDLE_DIR}/paddle/fluid/inference/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
+    else()
+	    set(DEPS
+            ${PADDLE_DIR}/paddle/lib/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
+    endif()
+endif()
+
 if(WITH_STATIC_LIB)
-  if (WIN32)
-    set(DEPS
-        ${PADDLE_DIR}/paddle/fluid/inference/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
-  else ()
     set(DEPS
         ${PADDLE_DIR}/paddle/lib/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
-  endif()
 else()
-  if (WIN32)
-    set(DEPS
-        ${PADDLE_DIR}/paddle/fluid/inference/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
-  else ()
     set(DEPS
         ${PADDLE_DIR}/paddle/lib/libpaddle_fluid${CMAKE_SHARED_LIBRARY_SUFFIX})
-  endif()
 endif()
 
 if (NOT WIN32)
-- 
GitLab