From fc4435174b004b2fd54aaafe13152c186f719310 Mon Sep 17 00:00:00 2001
From: silingtong123 <35439432+silingtong123@users.noreply.github.com>
Date: Fri, 5 Jun 2020 10:52:03 +0800
Subject: [PATCH] test=develop, fix the bug of tensorrt package can't compile
 on windows (#24860)

* test=develop, fix a bug

* test=develop, remove the macro of PADDLE_DLL_INFERENCE
---
 cmake/configure.cmake                             | 1 +
 paddle/fluid/inference/CMakeLists.txt             | 4 ----
 paddle/fluid/inference/api/paddle_infer_declare.h | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 323b1632e9f..51a267074df 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -48,6 +48,7 @@ if(WIN32)
   SET(CMAKE_C_RESPONSE_FILE_LINK_FLAG "@")
   SET(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")
 
+  add_definitions(-DPADDLE_DLL_INFERENCE)
   # set definition for the dll export
   if (NOT MSVC)
     message(FATAL "Windows build only support msvc. Which was binded by the nvcc compiler of NVIDIA.")
diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt
index 5887a330687..a78fe41552b 100644
--- a/paddle/fluid/inference/CMakeLists.txt
+++ b/paddle/fluid/inference/CMakeLists.txt
@@ -17,10 +17,6 @@ if(WITH_TESTING)
   include(tests/test.cmake) # some generic cmake function for inference
 endif()
 
-if(WIN32)
-    add_definitions(-DPADDLE_DLL_INFERENCE)
-endif()
-
 # TODO(panyx0718): Should this be called paddle_fluid_inference_api_internal?
 cc_library(paddle_fluid_api
     SRCS io.cc
diff --git a/paddle/fluid/inference/api/paddle_infer_declare.h b/paddle/fluid/inference/api/paddle_infer_declare.h
index e8525f440fe..39c9653f16c 100644
--- a/paddle/fluid/inference/api/paddle_infer_declare.h
+++ b/paddle/fluid/inference/api/paddle_infer_declare.h
@@ -17,7 +17,11 @@
 #if defined(_WIN32)
 #ifndef PD_INFER_DECL
 #ifdef PADDLE_DLL_INFERENCE
+#ifndef PADDLE_ON_INFERENCE
+#define PD_INFER_DECL
+#else
 #define PD_INFER_DECL __declspec(dllexport)
+#endif  // PADDLE_ON_INFERENCE
 #else
 #define PD_INFER_DECL __declspec(dllimport)
 #endif  // PADDLE_DLL_INFERENCE
-- 
GitLab