mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 07:43:03 +04:00
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
This commit is contained in:
committed by
Alexander Alekhin
parent
3a2a74b655
commit
e629785a97
@@ -11,8 +11,10 @@
|
||||
# if defined(__OPENCV_BUILD)
|
||||
# include <opencv2/core/base.hpp>
|
||||
# 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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user