diff options
| author | dbj <dbj> | 2016-02-17 04:49:47 +0000 |
|---|---|---|
| committer | dbj <dbj> | 2016-02-17 04:49:47 +0000 |
| commit | 13ffd3ef9104f7f7dad1c83efc221983ff3db06f (patch) | |
| tree | 7726b49b71e16e291539b58e6d6c2c138fc9a339 /graphics/openimageio/patches | |
| parent | e7d9a35a562a21d1b0c0519b0e1de54ab9ba7b86 (diff) | |
| download | pkgsrc-13ffd3ef9104f7f7dad1c83efc221983ff3db06f.tar.gz | |
fix linking of openCV libraries.
fixes build on Darwin
Diffstat (limited to 'graphics/openimageio/patches')
| -rw-r--r-- | graphics/openimageio/patches/patch-src_cmake_externalpackages.cmake | 22 | ||||
| -rw-r--r-- | graphics/openimageio/patches/patch-src_libOpenImageIO_CMakeLists.txt | 13 |
2 files changed, 35 insertions, 0 deletions
diff --git a/graphics/openimageio/patches/patch-src_cmake_externalpackages.cmake b/graphics/openimageio/patches/patch-src_cmake_externalpackages.cmake new file mode 100644 index 00000000000..3043eeccdd3 --- /dev/null +++ b/graphics/openimageio/patches/patch-src_cmake_externalpackages.cmake @@ -0,0 +1,22 @@ +$NetBSD: patch-src_cmake_externalpackages.cmake,v 1.1 2016/02/17 04:49:47 dbj Exp $ + +--- src/cmake/externalpackages.cmake.orig 2015-06-11 17:25:58.000000000 +0000 ++++ src/cmake/externalpackages.cmake +@@ -467,7 +467,16 @@ if (USE_OPENCV) + /usr/local/lib + /opt/local/lib + ) +- set (OpenCV_LIBS "${OpenCV_LIBS} ${OpenCV_LIBS_highgui}") ++ set (OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_LIBS_highgui}) ++ find_library (OpenCV_LIBS_videoio ++ NAMES opencv_videoio ++ PATHS "${THIRD_PARTY_TOOLS_HOME}/lib/" ++ "${PROJECT_SOURCE_DIR}/lib" ++ "${OpenCV_HOME}/lib" ++ /usr/local/lib ++ /opt/local/lib ++ ) ++ set (OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_LIBS_videoio}) + if (OpenCV_INCLUDE_DIR AND OpenCV_LIBS) + set (OpenCV_FOUND TRUE) + add_definitions ("-DUSE_OPENCV") diff --git a/graphics/openimageio/patches/patch-src_libOpenImageIO_CMakeLists.txt b/graphics/openimageio/patches/patch-src_libOpenImageIO_CMakeLists.txt new file mode 100644 index 00000000000..71bda3da2b6 --- /dev/null +++ b/graphics/openimageio/patches/patch-src_libOpenImageIO_CMakeLists.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-src_libOpenImageIO_CMakeLists.txt,v 1.1 2016/02/17 04:49:47 dbj Exp $ + +--- src/libOpenImageIO/CMakeLists.txt.orig 2015-06-11 17:25:58.000000000 +0000 ++++ src/libOpenImageIO/CMakeLists.txt +@@ -231,7 +231,7 @@ endif () + # Include OpenCV if using it + if (OpenCV_FOUND) + include_directories (${OpenCV_INCLUDE_DIR}) +- target_link_libraries (OpenImageIO opencv_core opencv_highgui) ++ target_link_libraries (OpenImageIO ${OpenCV_LIBS}) + endif () + + # Include OpenSSL if using it |