Commit e629785a authored by Andrey Golubev's avatar Andrey Golubev Committed by Alexander Alekhin

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
parent 3a2a74b6
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
# if defined(__OPENCV_BUILD) # if defined(__OPENCV_BUILD)
# include <opencv2/core/base.hpp> # include <opencv2/core/base.hpp>
# define GAPI_EXPORTS CV_EXPORTS # define GAPI_EXPORTS CV_EXPORTS
# else # else
# define GAPI_EXPORTS
#if 0 // Note: the following version currently is not needed for non-OpenCV build
# if defined _WIN32 # if defined _WIN32
# define GAPI_EXPORTS __declspec(dllexport) # define GAPI_EXPORTS __declspec(dllexport)
# elif defined __GNUC__ && __GNUC__ >= 4 # elif defined __GNUC__ && __GNUC__ >= 4
...@@ -22,6 +24,7 @@ ...@@ -22,6 +24,7 @@
# ifndef GAPI_EXPORTS # ifndef GAPI_EXPORTS
# define GAPI_EXPORTS # define GAPI_EXPORTS
# endif # endif
#endif
# endif # endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment