]>
Commit | Line | Data |
---|---|---|
6e575f79 JR |
1 | --- OpenImageIO-oiio-4070df8/src/cmake/externalpackages.cmake~ 2015-12-19 07:44:03.000000000 +0100 |
2 | +++ OpenImageIO-oiio-4070df8/src/cmake/externalpackages.cmake 2016-03-21 11:06:58.754135430 +0100 | |
3 | @@ -504,6 +504,14 @@ | |
4 | /usr/local/lib | |
5 | /opt/local/lib | |
6 | ) | |
7 | + find_library (OpenCV_LIBS_videoio | |
8 | + NAMES opencv_videoio | |
9 | + PATHS "${THIRD_PARTY_TOOLS_HOME}/lib/" | |
10 | + "${PROJECT_SOURCE_DIR}/lib" | |
11 | + "${OpenCV_HOME}/lib" | |
12 | + /usr/local/lib | |
13 | + /opt/local/lib | |
14 | + ) | |
15 | set (OpenCV_LIBS "${OpenCV_LIBS} ${OpenCV_LIBS_highgui}") | |
16 | if (OpenCV_INCLUDE_DIR AND OpenCV_LIBS) | |
17 | set (OpenCV_FOUND TRUE) | |
18 | --- OpenImageIO-oiio-4070df8/src/libOpenImageIO/CMakeLists.txt~ 2016-03-21 11:03:35.000000000 +0100 | |
19 | +++ OpenImageIO-oiio-4070df8/src/libOpenImageIO/CMakeLists.txt 2016-03-21 11:08:09.865289491 +0100 | |
20 | @@ -255,7 +255,7 @@ | |
21 | # Include OpenCV if using it | |
22 | if (OpenCV_FOUND) | |
23 | include_directories (${OpenCV_INCLUDE_DIR}) | |
24 | - target_link_libraries (OpenImageIO opencv_core opencv_highgui) | |
25 | + target_link_libraries (OpenImageIO opencv_core opencv_highgui opencv_videoio) | |
26 | endif () | |
27 | ||
28 | # Include OpenSSL if using it |