mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13209 from alalek:issue_12865

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-21 14:30:31 +00:00
commit adf2013052
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVModule.cmake
View File

@ -909,7 +909,11 @@ macro(_ocv_create_module)
source_group("Src" FILES "${_VS_VERSION_FILE}") source_group("Src" FILES "${_VS_VERSION_FILE}")
endif() endif()
endif() endif()
if(WIN32 AND NOT ("${the_module}" STREQUAL "opencv_core" OR "${the_module}" STREQUAL "opencv_world") if(WIN32 AND NOT (
"${the_module}" STREQUAL "opencv_core" OR
"${the_module}" STREQUAL "opencv_world" OR
"${the_module}" STREQUAL "opencv_cudev"
)
AND (BUILD_SHARED_LIBS AND NOT "x${OPENCV_MODULE_TYPE}" STREQUAL "xSTATIC") AND (BUILD_SHARED_LIBS AND NOT "x${OPENCV_MODULE_TYPE}" STREQUAL "xSTATIC")
AND NOT OPENCV_SKIP_DLLMAIN_GENERATION AND NOT OPENCV_SKIP_DLLMAIN_GENERATION
) )