Allow setting IS_PART_OF_WORLD in command line, fix videoio plugin linking

pull/14771/head
Maksim Shabunin 6 years ago
parent 1aefa6779f
commit f99f58d99f
  1. 1
      cmake/OpenCVModule.cmake
  2. 4
      modules/videoio/cmake/plugin.cmake

@ -185,6 +185,7 @@ macro(ocv_add_module _name)
# add self to the world dependencies
if((NOT DEFINED OPENCV_MODULE_IS_PART_OF_WORLD
AND NOT OPENCV_MODULE_${the_module}_CLASS STREQUAL "BINDINGS"
AND (NOT DEFINED OPENCV_MODULE_${the_module}_IS_PART_OF_WORLD OR OPENCV_MODULE_${the_module}_IS_PART_OF_WORLD)
AND (NOT OPENCV_PROCESSING_EXTRA_MODULES OR NOT OPENCV_WORLD_EXCLUDE_EXTRA_MODULES)
AND (NOT BUILD_SHARED_LIBS OR NOT "x${OPENCV_MODULE_TYPE}" STREQUAL "xSTATIC"))
OR OPENCV_MODULE_IS_PART_OF_WORLD

@ -21,8 +21,8 @@ function(ocv_create_builtin_videoio_plugin name target)
target_link_libraries(${name} PRIVATE ${target})
foreach(mod opencv_videoio opencv_core opencv_imgproc opencv_imgcodecs)
target_link_libraries(${name} PRIVATE ${mod})
target_include_directories(${name} PRIVATE "${OPENCV_MODULE_${mod}_LOCATION}/include")
ocv_target_link_libraries(${name} LINK_PRIVATE ${mod})
ocv_target_include_directories(${name} PRIVATE "${OPENCV_MODULE_${mod}_LOCATION}/include")
endforeach()
set_target_properties(${name} PROPERTIES

Loading…
Cancel
Save