From e629785a978d29333f1e77c7c33b3802650db608 Mon Sep 17 00:00:00 2001 From: Andrey Golubev Date: Tue, 16 Jul 2019 18:53:51 +0300 Subject: [PATCH] Merge pull request #15021 from andrey-golubev:gapi_fix_standalone_exports * Fix G-API export specifier in standalone build * Make dummy GAPI_EXPORTS in case of non-OpenCV builds * Add old version under #if 0 --- modules/gapi/include/opencv2/gapi/own/exports.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/gapi/include/opencv2/gapi/own/exports.hpp b/modules/gapi/include/opencv2/gapi/own/exports.hpp index b1eddaa591..53bff2aef4 100644 --- a/modules/gapi/include/opencv2/gapi/own/exports.hpp +++ b/modules/gapi/include/opencv2/gapi/own/exports.hpp @@ -11,8 +11,10 @@ # if defined(__OPENCV_BUILD) # include # define GAPI_EXPORTS CV_EXPORTS - # else +# define GAPI_EXPORTS + +#if 0 // Note: the following version currently is not needed for non-OpenCV build # if defined _WIN32 # define GAPI_EXPORTS __declspec(dllexport) # elif defined __GNUC__ && __GNUC__ >= 4 @@ -22,6 +24,7 @@ # ifndef GAPI_EXPORTS # define GAPI_EXPORTS # endif +#endif # endif