Merge pull request #13209 from alalek:issue_12865

pull/13243/head
Alexander Alekhin 6 years ago
commit adf2013052
  1. 6
      cmake/OpenCVModule.cmake

@ -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
) )

Loading…
Cancel
Save