third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

videoio: fix plugins build with enabled Eigen

Browse Source
This commit is contained in:
Alexander Alekhin 2020-09-25 12:42:22 +00:00
parent 0dc28d3446
commit f6901ab877
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/videoio/cmake/plugin.cmake
View File

@ -22,7 +22,7 @@ function(ocv_create_builtin_videoio_plugin name target)
foreach(mod opencv_videoio opencv_core opencv_imgproc opencv_imgcodecs) foreach(mod opencv_videoio opencv_core opencv_imgproc opencv_imgcodecs)
ocv_target_link_libraries(${name} LINK_PRIVATE ${mod}) 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() endforeach()
if(WIN32) if(WIN32)

6
modules/videoio/src/precomp.hpp
View File

@ -42,6 +42,12 @@
#ifndef __VIDEOIO_H_ #ifndef __VIDEOIO_H_
#define __VIDEOIO_H_ #define __VIDEOIO_H_
#if defined(__OPENCV_BUILD) && defined(BUILD_PLUGIN)
#undef __OPENCV_BUILD // allow public API only
#include <opencv2/core.hpp>
#include <opencv2/core/utils/trace.hpp>
#endif
#if defined __linux__ || defined __APPLE__ || defined __HAIKU__ #if defined __linux__ || defined __APPLE__ || defined __HAIKU__
#include <unistd.h> // -D_FORTIFY_SOURCE=2 workaround: https://github.com/opencv/opencv/issues/15020 #include <unistd.h> // -D_FORTIFY_SOURCE=2 workaround: https://github.com/opencv/opencv/issues/15020
#endif #endif