generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.

Browse Source 
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
This commit is contained in:
Roman Donchenko 2013-07-26 14:35:40 +04:00
parent be8b3687f4
commit ee182eb086
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/OpenCVModule.cmake
View File

@ -508,7 +508,8 @@ macro(ocv_create_module)
)
endif()
if(BUILD_SHARED_LIBS)
if((NOT DEFINED OPENCV_MODULE_TYPE AND BUILD_SHARED_LIBS)
OR (DEFINED OPENCV_MODULE_TYPE AND OPENCV_MODULE_TYPE STREQUAL SHARED))
if(MSVC)
set_target_properties(${the_module} PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS)
else()

2
modules/core/src/system.cpp
View File

@ -779,7 +779,7 @@ cvGetModuleInfo( const char* name, const char **version, const char **plugin_lis
*plugin_list = plugin_list_buf;
}
#if defined BUILD_SHARED_LIBS && defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
#if defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID );
BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID )