diff options
author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2015-08-01 16:28:20 -0500 |
---|---|---|
committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2015-08-01 16:28:20 -0500 |
commit | 7f39d8947adfff989fb9136a0311b800a8d682d5 (patch) | |
tree | f52638c199798cca3b4fe93c12e52521986cb465 /libre/opencv/pkgconfig.patch | |
parent | e0199de4a098f6e2ac60023627ff4aa0c79108ca (diff) |
opencv-2.4.11-1.parabola1: updating version
Diffstat (limited to 'libre/opencv/pkgconfig.patch')
-rw-r--r-- | libre/opencv/pkgconfig.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/libre/opencv/pkgconfig.patch b/libre/opencv/pkgconfig.patch deleted file mode 100644 index 5626eb6e0..000000000 --- a/libre/opencv/pkgconfig.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 |