From f6901ab87712808c5997e1c8679cafc216b3a3bc Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 25 Sep 2020 12:42:22 +0000 Subject: [PATCH] videoio: fix plugins build with enabled Eigen --- modules/videoio/cmake/plugin.cmake | 2 +- modules/videoio/src/precomp.hpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/videoio/cmake/plugin.cmake b/modules/videoio/cmake/plugin.cmake index 95490f2..7eaee3e 100644 --- a/modules/videoio/cmake/plugin.cmake +++ b/modules/videoio/cmake/plugin.cmake @@ -22,7 +22,7 @@ function(ocv_create_builtin_videoio_plugin name target) foreach(mod opencv_videoio opencv_core opencv_imgproc opencv_imgcodecs) ocv_target_link_libraries(${name} LINK_PRIVATE ${mod}) - ocv_target_include_directories(${name} PRIVATE "${OPENCV_MODULE_${mod}_LOCATION}/include") + ocv_target_include_directories(${name} "${OPENCV_MODULE_${mod}_LOCATION}/include") endforeach() if(WIN32) diff --git a/modules/videoio/src/precomp.hpp b/modules/videoio/src/precomp.hpp index 02242f7..eeea218 100644 --- a/modules/videoio/src/precomp.hpp +++ b/modules/videoio/src/precomp.hpp @@ -42,6 +42,12 @@ #ifndef __VIDEOIO_H_ #define __VIDEOIO_H_ +#if defined(__OPENCV_BUILD) && defined(BUILD_PLUGIN) +#undef __OPENCV_BUILD // allow public API only +#include +#include +#endif + #if defined __linux__ || defined __APPLE__ || defined __HAIKU__ #include // -D_FORTIFY_SOURCE=2 workaround: https://github.com/opencv/opencv/issues/15020 #endif -- 2.7.4