diff options
| author |   Matteo Bernardini | 2014-02-13 10:02:24 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2014-02-13 19:33:08 +0100 |
| commit | 32271d2d7da2f04cd7beb467f1d9ecbf731842e5 (patch) | |
| tree | f918e28f5c4fe312db8aa44c467cfeeaf1d9c882 /libraries/opencv/opencv-2.4.7-pkgconfig.patch | |
| parent | 4aab0d902151ae5b0f0952a6b47b7f218b51b81b (diff) | |
| download | slackbuilds-32271d2d7da2f04cd7beb467f1d9ecbf731842e5.tar.gz | |
libraries/opencv: Updated for version 2.4.8.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/opencv/opencv-2.4.7-pkgconfig.patch')
| -rw-r--r-- | libraries/opencv/opencv-2.4.7-pkgconfig.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/libraries/opencv/opencv-2.4.7-pkgconfig.patch b/libraries/opencv/opencv-2.4.7-pkgconfig.patch new file mode 100644 index 0000000000..5626eb6e02 --- /dev/null +++ b/libraries/opencv/opencv-2.4.7-pkgconfig.patch @@ -0,0 +1,35 @@ +diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake +--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000 ++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000 +@@ -10,7 +10,7 @@ + # ------------------------------------------------------------------------------------------- + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS ++set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}") + set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") + + if(CMAKE_BUILD_TYPE MATCHES "Release") +@@ -35,10 +35,11 @@ + ocv_list_reverse(OpenCV_EXTRA_COMPONENTS) + + #build the list of components +-set(OpenCV_LIB_COMPONENTS_ "") ++set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}") + foreach(CVLib ${OpenCV_LIB_COMPONENTS}) + get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE}) + get_filename_component(libname "${libpath}" NAME) ++ get_filename_component(lname "${libpath}" NAME_WE) + + if(INSTALL_TO_MANGLED_PATHS) + set(libname "${libname}.${OPENCV_VERSION}") +@@ -51,7 +52,8 @@ + set(installDir "${OPENCV_LIB_INSTALL_PATH}") + endif() + +- set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}") ++ string(REPLACE "libopencv" "-lopencv" lname "${lname}") ++ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}") + endforeach() + + # add extra dependencies required for OpenCV |